diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5e32a9c59a..ea8cad7bf64c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,44 @@
+# __1.11.563__ __2019-05-30__
+## __AWS CodeCommit__
+  - ### Features
+    - This release adds APIs that allow adding and removing tags to a repository, and viewing tags for a repository. It also enables adding tags when creating a repository.
+
+## __AWS IoT Analytics__
+  - ### Features
+    - IoT Analytics adds the option to use your own S3 bucket to store channel and data store resources. Previously, only service-managed storage was used.
+
+## __AWS IoT Events__
+  - ### Features
+    - The AWS IoT Events service allows customers to monitor their IoT devices and sensors to detect failures or changes in operation and to trigger actions when these events occur
+
+## __AWS IoT Events Data__
+  - ### Features
+    - The AWS IoT Events service allows customers to monitor their IoT devices and sensors to detect failures or changes in operation and to trigger actions when these events occur
+
+## __AWS RDS DataService__
+  - ### Features
+    - The RDS Data API is generally available for the MySQL-compatible edition of Amazon Aurora Serverless in the US East (N. Virginia and Ohio), US West (Oregon), EU (Ireland), and Asia Pacific (Tokyo) regions. This service enables you to easily access Aurora Serverless clusters with web services-based applications including AWS Lambda and AWS AppSync. The new APIs included in this SDK release are ExecuteStatement, BatchExecuteStatement, BeginTransaction, CommitTransaction, and RollbackTransaction. The ExecuteSql API is deprecated; instead use ExecuteStatement which provides additional functionality including transaction support.
+
+## __AWS SDK for Java__
+  - ### Bugfixes
+    - Improved exception messages in credential providers to exclude detailed parse errors that may contain sensitive information.
+
+## __AWS Service Catalog__
+  - ### Features
+    - Service Catalog ListStackInstancesForProvisionedProduct API enables customers to get details of a provisioned product with type "CFN_STACKSET". By passing the provisioned product id, the API will list account, region and status of each stack instances that are associated with this provisioned product.
+
+## __Amazon Pinpoint Email Service__
+  - ### Features
+    - You can now specify whether the Amazon Pinpoint Email service must deliver email over a connection that is encrypted using Transport Layer Security (TLS).
+
+## __Amazon Relational Database Service__
+  - ### Features
+    - This release adds support for Activity Streams for database clusters.
+
+## __Managed Streaming for Kafka__
+  - ### Features
+    - Updated APIs for Amazon MSK to enable new features such as encryption in transit, client authentication, and scaling storage.
+
 # __1.11.562__ __2019-05-29__
 ## __AWS IoT Things Graph__
   - ### Features
diff --git a/README.md b/README.md
index 4c5e646e94c4..fb605e59412f 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ dependencies.
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-bom</artifactId>
-      <version>1.11.562</version>
+      <version>1.11.563</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/aws-java-sdk-acm/pom.xml b/aws-java-sdk-acm/pom.xml
index 96406e80a80e..1a460ff00891 100644
--- a/aws-java-sdk-acm/pom.xml
+++ b/aws-java-sdk-acm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-acm</artifactId>
diff --git a/aws-java-sdk-acmpca/pom.xml b/aws-java-sdk-acmpca/pom.xml
index 981d377db1f4..84726bc4dafb 100644
--- a/aws-java-sdk-acmpca/pom.xml
+++ b/aws-java-sdk-acmpca/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-acmpca</artifactId>
diff --git a/aws-java-sdk-alexaforbusiness/pom.xml b/aws-java-sdk-alexaforbusiness/pom.xml
index f4b74fe8632c..715f27ce1122 100644
--- a/aws-java-sdk-alexaforbusiness/pom.xml
+++ b/aws-java-sdk-alexaforbusiness/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-alexaforbusiness</artifactId>
diff --git a/aws-java-sdk-amplify/pom.xml b/aws-java-sdk-amplify/pom.xml
index 64b73d172f0a..7dd76bdc9212 100644
--- a/aws-java-sdk-amplify/pom.xml
+++ b/aws-java-sdk-amplify/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-amplify</artifactId>
diff --git a/aws-java-sdk-api-gateway/pom.xml b/aws-java-sdk-api-gateway/pom.xml
index a60fe0c355b2..95535dfb2333 100644
--- a/aws-java-sdk-api-gateway/pom.xml
+++ b/aws-java-sdk-api-gateway/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-api-gateway</artifactId>
diff --git a/aws-java-sdk-apigatewaymanagementapi/pom.xml b/aws-java-sdk-apigatewaymanagementapi/pom.xml
index 593a42c934b8..c8b67317ff76 100644
--- a/aws-java-sdk-apigatewaymanagementapi/pom.xml
+++ b/aws-java-sdk-apigatewaymanagementapi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-apigatewaymanagementapi</artifactId>
diff --git a/aws-java-sdk-apigatewayv2/pom.xml b/aws-java-sdk-apigatewayv2/pom.xml
index 82fbbcf38a19..de9b9a2abac4 100644
--- a/aws-java-sdk-apigatewayv2/pom.xml
+++ b/aws-java-sdk-apigatewayv2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-apigatewayv2</artifactId>
diff --git a/aws-java-sdk-applicationautoscaling/pom.xml b/aws-java-sdk-applicationautoscaling/pom.xml
index e06cb49d06c1..dc6a24ef5ba9 100644
--- a/aws-java-sdk-applicationautoscaling/pom.xml
+++ b/aws-java-sdk-applicationautoscaling/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-applicationautoscaling</artifactId>
diff --git a/aws-java-sdk-appmesh/pom.xml b/aws-java-sdk-appmesh/pom.xml
index f20c03611fec..b04ca0eb2644 100644
--- a/aws-java-sdk-appmesh/pom.xml
+++ b/aws-java-sdk-appmesh/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-appmesh</artifactId>
diff --git a/aws-java-sdk-appstream/pom.xml b/aws-java-sdk-appstream/pom.xml
index 86e1b676a0f1..6e79faed7436 100644
--- a/aws-java-sdk-appstream/pom.xml
+++ b/aws-java-sdk-appstream/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-appstream</artifactId>
diff --git a/aws-java-sdk-appsync/pom.xml b/aws-java-sdk-appsync/pom.xml
index c731636246dc..c99e37aaf7e0 100644
--- a/aws-java-sdk-appsync/pom.xml
+++ b/aws-java-sdk-appsync/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-appsync</artifactId>
diff --git a/aws-java-sdk-athena/pom.xml b/aws-java-sdk-athena/pom.xml
index eac0175c9ba1..cd907c6f4120 100644
--- a/aws-java-sdk-athena/pom.xml
+++ b/aws-java-sdk-athena/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-athena</artifactId>
diff --git a/aws-java-sdk-autoscaling/pom.xml b/aws-java-sdk-autoscaling/pom.xml
index 2fe426209f85..240896b0fa27 100644
--- a/aws-java-sdk-autoscaling/pom.xml
+++ b/aws-java-sdk-autoscaling/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-autoscaling</artifactId>
diff --git a/aws-java-sdk-autoscalingplans/pom.xml b/aws-java-sdk-autoscalingplans/pom.xml
index 737834082cbf..35e625cc3ab1 100644
--- a/aws-java-sdk-autoscalingplans/pom.xml
+++ b/aws-java-sdk-autoscalingplans/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-autoscalingplans</artifactId>
diff --git a/aws-java-sdk-backup/pom.xml b/aws-java-sdk-backup/pom.xml
index 67809ced8d71..3eb570e46266 100644
--- a/aws-java-sdk-backup/pom.xml
+++ b/aws-java-sdk-backup/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-backup</artifactId>
diff --git a/aws-java-sdk-batch/pom.xml b/aws-java-sdk-batch/pom.xml
index 1b1f780966ca..9d8bbc6eb883 100644
--- a/aws-java-sdk-batch/pom.xml
+++ b/aws-java-sdk-batch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-batch</artifactId>
diff --git a/aws-java-sdk-bom/pom.xml b/aws-java-sdk-bom/pom.xml
index 8638a53b340a..dba439caf895 100644
--- a/aws-java-sdk-bom/pom.xml
+++ b/aws-java-sdk-bom/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-bom</artifactId>
@@ -16,6 +16,18 @@
   <dependencyManagement>
     <!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
     <dependencies>
+    <dependency>
+        <artifactId>aws-java-sdk-ioteventsdata</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>aws-java-sdk-iotevents</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
     <dependency>
         <artifactId>aws-java-sdk-iotthingsgraph</artifactId>
         <groupId>com.amazonaws</groupId>
diff --git a/aws-java-sdk-budgets/pom.xml b/aws-java-sdk-budgets/pom.xml
index 71e62e7cc08c..ea7f91d7de06 100644
--- a/aws-java-sdk-budgets/pom.xml
+++ b/aws-java-sdk-budgets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-budgets</artifactId>
diff --git a/aws-java-sdk-bundle/pom.xml b/aws-java-sdk-bundle/pom.xml
index ab421a40405c..9680840b68d2 100644
--- a/aws-java-sdk-bundle/pom.xml
+++ b/aws-java-sdk-bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-pom</artifactId>
-        <version>1.11.563-SNAPSHOT</version>
+        <version>1.11.563</version>
     </parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-bundle</artifactId>
@@ -24,7 +24,7 @@
         <artifactId>aws-java-sdk</artifactId>
         <groupId>com.amazonaws</groupId>
         <optional>false</optional>
-        <version>1.11.563-SNAPSHOT</version>
+        <version>1.11.563</version>
     </dependency>
 </dependencies>
 
diff --git a/aws-java-sdk-chime/pom.xml b/aws-java-sdk-chime/pom.xml
index 8c6961a2c4d3..bbf729050123 100644
--- a/aws-java-sdk-chime/pom.xml
+++ b/aws-java-sdk-chime/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-chime</artifactId>
diff --git a/aws-java-sdk-cloud9/pom.xml b/aws-java-sdk-cloud9/pom.xml
index ec1ce98cbf35..84a20b1e7781 100644
--- a/aws-java-sdk-cloud9/pom.xml
+++ b/aws-java-sdk-cloud9/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloud9</artifactId>
diff --git a/aws-java-sdk-clouddirectory/pom.xml b/aws-java-sdk-clouddirectory/pom.xml
index 966e41292c0c..f2b5020931d4 100644
--- a/aws-java-sdk-clouddirectory/pom.xml
+++ b/aws-java-sdk-clouddirectory/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-clouddirectory</artifactId>
diff --git a/aws-java-sdk-cloudformation/pom.xml b/aws-java-sdk-cloudformation/pom.xml
index 93efdd4202ac..3158b9f35967 100644
--- a/aws-java-sdk-cloudformation/pom.xml
+++ b/aws-java-sdk-cloudformation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudformation</artifactId>
diff --git a/aws-java-sdk-cloudfront/pom.xml b/aws-java-sdk-cloudfront/pom.xml
index 90b0ba4d9d85..a5a7577221ae 100644
--- a/aws-java-sdk-cloudfront/pom.xml
+++ b/aws-java-sdk-cloudfront/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudfront</artifactId>
diff --git a/aws-java-sdk-cloudhsm/pom.xml b/aws-java-sdk-cloudhsm/pom.xml
index bd97314d7803..bd0c7b9e0e15 100644
--- a/aws-java-sdk-cloudhsm/pom.xml
+++ b/aws-java-sdk-cloudhsm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudhsm</artifactId>
diff --git a/aws-java-sdk-cloudhsmv2/pom.xml b/aws-java-sdk-cloudhsmv2/pom.xml
index 7d73ef0e605b..e5ec7adf59d0 100644
--- a/aws-java-sdk-cloudhsmv2/pom.xml
+++ b/aws-java-sdk-cloudhsmv2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudhsmv2</artifactId>
diff --git a/aws-java-sdk-cloudsearch/pom.xml b/aws-java-sdk-cloudsearch/pom.xml
index b0f56e829258..3390e5aabe55 100644
--- a/aws-java-sdk-cloudsearch/pom.xml
+++ b/aws-java-sdk-cloudsearch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudsearch</artifactId>
diff --git a/aws-java-sdk-cloudtrail/pom.xml b/aws-java-sdk-cloudtrail/pom.xml
index c792657e17a6..367ba3b1ea90 100644
--- a/aws-java-sdk-cloudtrail/pom.xml
+++ b/aws-java-sdk-cloudtrail/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudtrail</artifactId>
diff --git a/aws-java-sdk-cloudwatch/pom.xml b/aws-java-sdk-cloudwatch/pom.xml
index 4445ad99fa6a..1e02d0f6b7a2 100644
--- a/aws-java-sdk-cloudwatch/pom.xml
+++ b/aws-java-sdk-cloudwatch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudwatch</artifactId>
diff --git a/aws-java-sdk-cloudwatchmetrics/pom.xml b/aws-java-sdk-cloudwatchmetrics/pom.xml
index 66163b835b09..4ecf3ad21147 100644
--- a/aws-java-sdk-cloudwatchmetrics/pom.xml
+++ b/aws-java-sdk-cloudwatchmetrics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
diff --git a/aws-java-sdk-code-generator/pom.xml b/aws-java-sdk-code-generator/pom.xml
index eacd00a33fec..731ae908d3be 100644
--- a/aws-java-sdk-code-generator/pom.xml
+++ b/aws-java-sdk-code-generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-code-generator</artifactId>
diff --git a/aws-java-sdk-codebuild/pom.xml b/aws-java-sdk-codebuild/pom.xml
index d6902d1e4250..37b492f8558a 100644
--- a/aws-java-sdk-codebuild/pom.xml
+++ b/aws-java-sdk-codebuild/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codebuild</artifactId>
diff --git a/aws-java-sdk-codecommit/pom.xml b/aws-java-sdk-codecommit/pom.xml
index 8016465328d4..1d0c9dd21cc5 100644
--- a/aws-java-sdk-codecommit/pom.xml
+++ b/aws-java-sdk-codecommit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codecommit</artifactId>
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommit.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommit.java
index 235fc9ed4fb5..8a019273554d 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommit.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommit.java
@@ -258,6 +258,27 @@
  * </li>
  * </ul>
  * <p>
+ * Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:
+ * </p>
+ * <ul>
+ * <li>
+ * <p>
+ * <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS
+ * CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * </ul>
+ * <p>
  * Triggers, by calling the following:
  * </p>
  * <ul>
@@ -281,7 +302,7 @@
  * </ul>
  * <p>
  * For information about how to use AWS CodeCommit, see the <a
- * href="http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
+ * href="https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
  * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
@@ -675,6 +696,14 @@ public interface AWSCodeCommit {
      *         No encryption key was found.
      * @throws EncryptionKeyUnavailableException
      *         The encryption key is not available.
+     * @throws InvalidTagsMapException
+     *         The map of tags is not valid.
+     * @throws TooManyTagsException
+     *         The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+     * @throws InvalidSystemTagUsageException
+     *         The specified tag is not valid. Key names cannot be prefixed with aws:.
+     * @throws TagPolicyException
+     *         The tag policy is not valid.
      * @sample AWSCodeCommit.CreateRepository
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/CreateRepository" target="_top">AWS
      *      API Documentation</a>
@@ -929,7 +958,7 @@ public interface AWSCodeCommit {
      *         The encryption key is not available.
      * @throws FileTooLargeException
      *         The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in
-     *         AWS CodeCommit, see <a href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
+     *         AWS CodeCommit, see <a href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
      *         CodeCommit User Guide</a>.
      * @sample AWSCodeCommit.GetBlob
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/GetBlob" target="_top">AWS API
@@ -1229,7 +1258,7 @@ public interface AWSCodeCommit {
      *         The encryption key is not available.
      * @throws FileTooLargeException
      *         The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in
-     *         AWS CodeCommit, see <a href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
+     *         AWS CodeCommit, see <a href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
      *         CodeCommit User Guide</a>.
      * @sample AWSCodeCommit.GetFile
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/GetFile" target="_top">AWS API
@@ -1544,6 +1573,40 @@ public interface AWSCodeCommit {
      */
     ListRepositoriesResult listRepositories(ListRepositoriesRequest listRepositoriesRequest);
 
+    /**
+     * <p>
+     * Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid
+     * resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @return Result of the ListTagsForResource operation returned by the service.
+     * @throws RepositoryDoesNotExistException
+     *         The specified repository does not exist.
+     * @throws InvalidRepositoryNameException
+     *         At least one specified repository name is not valid.</p> <note>
+     *         <p>
+     *         This exception only occurs when a specified repository name is not valid. Other exceptions occur when a
+     *         required repository parameter is missing, or when a specified repository does not exist.
+     *         </p>
+     * @throws ResourceArnRequiredException
+     *         A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid
+     *         resources in AWS CodeCommit, see <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws InvalidResourceArnException
+     *         The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see
+     *         <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @sample AWSCodeCommit.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    ListTagsForResourceResult listTagsForResource(ListTagsForResourceRequest listTagsForResourceRequest);
+
     /**
      * <p>
      * Closes a pull request and attempts to merge the source commit of a pull request into the specified destination
@@ -1949,6 +2012,50 @@ public interface AWSCodeCommit {
      */
     PutRepositoryTriggersResult putRepositoryTriggers(PutRepositoryTriggersRequest putRepositoryTriggersRequest);
 
+    /**
+     * <p>
+     * Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a
+     * href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @return Result of the TagResource operation returned by the service.
+     * @throws RepositoryDoesNotExistException
+     *         The specified repository does not exist.
+     * @throws InvalidRepositoryNameException
+     *         At least one specified repository name is not valid.</p> <note>
+     *         <p>
+     *         This exception only occurs when a specified repository name is not valid. Other exceptions occur when a
+     *         required repository parameter is missing, or when a specified repository does not exist.
+     *         </p>
+     * @throws ResourceArnRequiredException
+     *         A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid
+     *         resources in AWS CodeCommit, see <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws InvalidResourceArnException
+     *         The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see
+     *         <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws TagsMapRequiredException
+     *         A map of tags is required.
+     * @throws InvalidTagsMapException
+     *         The map of tags is not valid.
+     * @throws TooManyTagsException
+     *         The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+     * @throws InvalidSystemTagUsageException
+     *         The specified tag is not valid. Key names cannot be prefixed with aws:.
+     * @throws TagPolicyException
+     *         The tag policy is not valid.
+     * @sample AWSCodeCommit.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    TagResourceResult tagResource(TagResourceRequest tagResourceRequest);
+
     /**
      * <p>
      * Tests the functionality of repository triggers by sending information to the trigger target. If real data is
@@ -2014,6 +2121,49 @@ public interface AWSCodeCommit {
      */
     TestRepositoryTriggersResult testRepositoryTriggers(TestRepositoryTriggersRequest testRepositoryTriggersRequest);
 
+    /**
+     * <p>
+     * Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @return Result of the UntagResource operation returned by the service.
+     * @throws RepositoryDoesNotExistException
+     *         The specified repository does not exist.
+     * @throws InvalidRepositoryNameException
+     *         At least one specified repository name is not valid.</p> <note>
+     *         <p>
+     *         This exception only occurs when a specified repository name is not valid. Other exceptions occur when a
+     *         required repository parameter is missing, or when a specified repository does not exist.
+     *         </p>
+     * @throws ResourceArnRequiredException
+     *         A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid
+     *         resources in AWS CodeCommit, see <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws InvalidResourceArnException
+     *         The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see
+     *         <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws TagKeysListRequiredException
+     *         A list of tag keys is required. The list cannot be empty or null.
+     * @throws InvalidTagKeysListException
+     *         The list of tags is not valid.
+     * @throws TooManyTagsException
+     *         The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+     * @throws InvalidSystemTagUsageException
+     *         The specified tag is not valid. Key names cannot be prefixed with aws:.
+     * @throws TagPolicyException
+     *         The tag policy is not valid.
+     * @sample AWSCodeCommit.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    UntagResourceResult untagResource(UntagResourceRequest untagResourceRequest);
+
     /**
      * <p>
      * Replaces the contents of a comment.
@@ -2227,7 +2377,7 @@ public interface AWSCodeCommit {
      * Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository
      * names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters.
      * The suffix ".git" is prohibited. For a full description of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide.
      * </p>
      * 
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsync.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsync.java
index cc84461eefef..ece5b0efaccd 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsync.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsync.java
@@ -257,6 +257,27 @@
  * </li>
  * </ul>
  * <p>
+ * Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:
+ * </p>
+ * <ul>
+ * <li>
+ * <p>
+ * <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS
+ * CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * </ul>
+ * <p>
  * Triggers, by calling the following:
  * </p>
  * <ul>
@@ -280,7 +301,7 @@
  * </ul>
  * <p>
  * For information about how to use AWS CodeCommit, see the <a
- * href="http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
+ * href="https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
  * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
@@ -1188,6 +1209,43 @@ java.util.concurrent.Future<ListPullRequestsResult> listPullRequestsAsync(ListPu
     java.util.concurrent.Future<ListRepositoriesResult> listRepositoriesAsync(ListRepositoriesRequest listRepositoriesRequest,
             com.amazonaws.handlers.AsyncHandler<ListRepositoriesRequest, ListRepositoriesResult> asyncHandler);
 
+    /**
+     * <p>
+     * Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid
+     * resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @return A Java Future containing the result of the ListTagsForResource operation returned by the service.
+     * @sample AWSCodeCommitAsync.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest listTagsForResourceRequest);
+
+    /**
+     * <p>
+     * Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid
+     * resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListTagsForResource operation returned by the service.
+     * @sample AWSCodeCommitAsyncHandler.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest listTagsForResourceRequest,
+            com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult> asyncHandler);
+
     /**
      * <p>
      * Closes a pull request and attempts to merge the source commit of a pull request into the specified destination
@@ -1390,6 +1448,43 @@ java.util.concurrent.Future<PutFileResult> putFileAsync(PutFileRequest putFileRe
     java.util.concurrent.Future<PutRepositoryTriggersResult> putRepositoryTriggersAsync(PutRepositoryTriggersRequest putRepositoryTriggersRequest,
             com.amazonaws.handlers.AsyncHandler<PutRepositoryTriggersRequest, PutRepositoryTriggersResult> asyncHandler);
 
+    /**
+     * <p>
+     * Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a
+     * href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @return A Java Future containing the result of the TagResource operation returned by the service.
+     * @sample AWSCodeCommitAsync.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest tagResourceRequest);
+
+    /**
+     * <p>
+     * Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a
+     * href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the TagResource operation returned by the service.
+     * @sample AWSCodeCommitAsyncHandler.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest tagResourceRequest,
+            com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult> asyncHandler);
+
     /**
      * <p>
      * Tests the functionality of repository triggers by sending information to the trigger target. If real data is
@@ -1427,6 +1522,41 @@ java.util.concurrent.Future<PutRepositoryTriggersResult> putRepositoryTriggersAs
     java.util.concurrent.Future<TestRepositoryTriggersResult> testRepositoryTriggersAsync(TestRepositoryTriggersRequest testRepositoryTriggersRequest,
             com.amazonaws.handlers.AsyncHandler<TestRepositoryTriggersRequest, TestRepositoryTriggersResult> asyncHandler);
 
+    /**
+     * <p>
+     * Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @return A Java Future containing the result of the UntagResource operation returned by the service.
+     * @sample AWSCodeCommitAsync.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest untagResourceRequest);
+
+    /**
+     * <p>
+     * Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the UntagResource operation returned by the service.
+     * @sample AWSCodeCommitAsyncHandler.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest untagResourceRequest,
+            com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler);
+
     /**
      * <p>
      * Replaces the contents of a comment.
@@ -1656,7 +1786,7 @@ java.util.concurrent.Future<UpdateRepositoryDescriptionResult> updateRepositoryD
      * Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository
      * names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters.
      * The suffix ".git" is prohibited. For a full description of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide.
      * </p>
      * 
@@ -1674,7 +1804,7 @@ java.util.concurrent.Future<UpdateRepositoryDescriptionResult> updateRepositoryD
      * Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository
      * names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters.
      * The suffix ".git" is prohibited. For a full description of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide.
      * </p>
      * 
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsyncClient.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsyncClient.java
index 9663205c1725..15e294cdacea 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsyncClient.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitAsyncClient.java
@@ -262,6 +262,27 @@
  * </li>
  * </ul>
  * <p>
+ * Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:
+ * </p>
+ * <ul>
+ * <li>
+ * <p>
+ * <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS
+ * CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * </ul>
+ * <p>
  * Triggers, by calling the following:
  * </p>
  * <ul>
@@ -285,7 +306,7 @@
  * </ul>
  * <p>
  * For information about how to use AWS CodeCommit, see the <a
- * href="http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
+ * href="https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
  * </p>
  */
 @ThreadSafe
@@ -1355,6 +1376,39 @@ public ListRepositoriesResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest request) {
+
+        return listTagsForResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(final ListTagsForResourceRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult> asyncHandler) {
+        final ListTagsForResourceRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListTagsForResourceResult>() {
+            @Override
+            public ListTagsForResourceResult call() throws Exception {
+                ListTagsForResourceResult result = null;
+
+                try {
+                    result = executeListTagsForResource(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<MergePullRequestByFastForwardResult> mergePullRequestByFastForwardAsync(MergePullRequestByFastForwardRequest request) {
 
@@ -1554,6 +1608,39 @@ public PutRepositoryTriggersResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest request) {
+
+        return tagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(final TagResourceRequest request,
+            final com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult> asyncHandler) {
+        final TagResourceRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<TagResourceResult>() {
+            @Override
+            public TagResourceResult call() throws Exception {
+                TagResourceResult result = null;
+
+                try {
+                    result = executeTagResource(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<TestRepositoryTriggersResult> testRepositoryTriggersAsync(TestRepositoryTriggersRequest request) {
 
@@ -1587,6 +1674,39 @@ public TestRepositoryTriggersResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest request) {
+
+        return untagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(final UntagResourceRequest request,
+            final com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler) {
+        final UntagResourceRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<UntagResourceResult>() {
+            @Override
+            public UntagResourceResult call() throws Exception {
+                UntagResourceResult result = null;
+
+                try {
+                    result = executeUntagResource(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<UpdateCommentResult> updateCommentAsync(UpdateCommentRequest request) {
 
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitClient.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitClient.java
index 1fa7e83f9be3..9c3d70334d8b 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitClient.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AWSCodeCommitClient.java
@@ -282,6 +282,27 @@
  * </li>
  * </ul>
  * <p>
+ * Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:
+ * </p>
+ * <ul>
+ * <li>
+ * <p>
+ * <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS
+ * CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * </ul>
+ * <p>
  * Triggers, by calling the following:
  * </p>
  * <ul>
@@ -305,7 +326,7 @@
  * </ul>
  * <p>
  * For information about how to use AWS CodeCommit, see the <a
- * href="http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
+ * href="https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
  * </p>
  */
 @ThreadSafe
@@ -384,6 +405,9 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("FileNameConflictsWithDirectoryNameException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.FileNameConflictsWithDirectoryNameException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InvalidResourceArnException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.InvalidResourceArnException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("EncryptionKeyAccessDeniedException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.EncryptionKeyAccessDeniedException.class))
@@ -411,6 +435,9 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("CommitDoesNotExistException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.CommitDoesNotExistException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ResourceArnRequiredException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.ResourceArnRequiredException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("InvalidRepositoryTriggerCustomDataException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.InvalidRepositoryTriggerCustomDataException.class))
@@ -447,6 +474,9 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("InvalidRelativeFileVersionEnumException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.InvalidRelativeFileVersionEnumException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("TagKeysListRequiredException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.TagKeysListRequiredException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("InvalidClientRequestTokenException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.InvalidClientRequestTokenException.class))
@@ -468,9 +498,18 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("CommentContentRequiredException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.CommentContentRequiredException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InvalidTagKeysListException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.InvalidTagKeysListException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("TagsMapRequiredException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.TagsMapRequiredException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("PathRequiredException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.PathRequiredException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InvalidSystemTagUsageException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.InvalidSystemTagUsageException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("RepositoryTriggerNameRequiredException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.RepositoryTriggerNameRequiredException.class))
@@ -606,6 +645,9 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("EncryptionKeyDisabledException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.EncryptionKeyDisabledException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("TooManyTagsException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.TooManyTagsException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("CommentNotCreatedByCallerException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.CommentNotCreatedByCallerException.class))
@@ -615,6 +657,9 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("TargetRequiredException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.TargetRequiredException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InvalidTagsMapException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.InvalidTagsMapException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("RestrictedSourceFileException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.RestrictedSourceFileException.class))
@@ -675,6 +720,9 @@ public class AWSCodeCommitClient extends AmazonWebServiceClient implements AWSCo
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("InvalidDestinationCommitSpecifierException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.InvalidDestinationCommitSpecifierException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("TagPolicyException").withModeledClass(
+                                    com.amazonaws.services.codecommit.model.TagPolicyException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("RepositoryTriggerBranchNameListRequiredException").withModeledClass(
                                     com.amazonaws.services.codecommit.model.RepositoryTriggerBranchNameListRequiredException.class))
@@ -1391,6 +1439,14 @@ final CreatePullRequestResult executeCreatePullRequest(CreatePullRequestRequest
      *         No encryption key was found.
      * @throws EncryptionKeyUnavailableException
      *         The encryption key is not available.
+     * @throws InvalidTagsMapException
+     *         The map of tags is not valid.
+     * @throws TooManyTagsException
+     *         The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+     * @throws InvalidSystemTagUsageException
+     *         The specified tag is not valid. Key names cannot be prefixed with aws:.
+     * @throws TagPolicyException
+     *         The tag policy is not valid.
      * @sample AWSCodeCommit.CreateRepository
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/CreateRepository" target="_top">AWS
      *      API Documentation</a>
@@ -1887,7 +1943,7 @@ final DescribePullRequestEventsResult executeDescribePullRequestEvents(DescribeP
      *         The encryption key is not available.
      * @throws FileTooLargeException
      *         The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in
-     *         AWS CodeCommit, see <a href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
+     *         AWS CodeCommit, see <a href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
      *         CodeCommit User Guide</a>.
      * @sample AWSCodeCommit.GetBlob
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/GetBlob" target="_top">AWS API
@@ -2471,7 +2527,7 @@ final GetDifferencesResult executeGetDifferences(GetDifferencesRequest getDiffer
      *         The encryption key is not available.
      * @throws FileTooLargeException
      *         The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in
-     *         AWS CodeCommit, see <a href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
+     *         AWS CodeCommit, see <a href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS
      *         CodeCommit User Guide</a>.
      * @sample AWSCodeCommit.GetFile
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/GetFile" target="_top">AWS API
@@ -3147,6 +3203,80 @@ final ListRepositoriesResult executeListRepositories(ListRepositoriesRequest lis
         }
     }
 
+    /**
+     * <p>
+     * Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid
+     * resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @return Result of the ListTagsForResource operation returned by the service.
+     * @throws RepositoryDoesNotExistException
+     *         The specified repository does not exist.
+     * @throws InvalidRepositoryNameException
+     *         At least one specified repository name is not valid.</p> <note>
+     *         <p>
+     *         This exception only occurs when a specified repository name is not valid. Other exceptions occur when a
+     *         required repository parameter is missing, or when a specified repository does not exist.
+     *         </p>
+     * @throws ResourceArnRequiredException
+     *         A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid
+     *         resources in AWS CodeCommit, see <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws InvalidResourceArnException
+     *         The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see
+     *         <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @sample AWSCodeCommit.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public ListTagsForResourceResult listTagsForResource(ListTagsForResourceRequest request) {
+        request = beforeClientExecution(request);
+        return executeListTagsForResource(request);
+    }
+
+    @SdkInternalApi
+    final ListTagsForResourceResult executeListTagsForResource(ListTagsForResourceRequest listTagsForResourceRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listTagsForResourceRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListTagsForResourceRequest> request = null;
+        Response<ListTagsForResourceResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListTagsForResourceRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(listTagsForResourceRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "CodeCommit");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListTagsForResource");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListTagsForResourceResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new ListTagsForResourceResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Closes a pull request and attempts to merge the source commit of a pull request into the specified destination
@@ -3799,6 +3929,90 @@ final PutRepositoryTriggersResult executePutRepositoryTriggers(PutRepositoryTrig
         }
     }
 
+    /**
+     * <p>
+     * Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a
+     * href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @return Result of the TagResource operation returned by the service.
+     * @throws RepositoryDoesNotExistException
+     *         The specified repository does not exist.
+     * @throws InvalidRepositoryNameException
+     *         At least one specified repository name is not valid.</p> <note>
+     *         <p>
+     *         This exception only occurs when a specified repository name is not valid. Other exceptions occur when a
+     *         required repository parameter is missing, or when a specified repository does not exist.
+     *         </p>
+     * @throws ResourceArnRequiredException
+     *         A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid
+     *         resources in AWS CodeCommit, see <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws InvalidResourceArnException
+     *         The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see
+     *         <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws TagsMapRequiredException
+     *         A map of tags is required.
+     * @throws InvalidTagsMapException
+     *         The map of tags is not valid.
+     * @throws TooManyTagsException
+     *         The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+     * @throws InvalidSystemTagUsageException
+     *         The specified tag is not valid. Key names cannot be prefixed with aws:.
+     * @throws TagPolicyException
+     *         The tag policy is not valid.
+     * @sample AWSCodeCommit.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public TagResourceResult tagResource(TagResourceRequest request) {
+        request = beforeClientExecution(request);
+        return executeTagResource(request);
+    }
+
+    @SdkInternalApi
+    final TagResourceResult executeTagResource(TagResourceRequest tagResourceRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(tagResourceRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<TagResourceRequest> request = null;
+        Response<TagResourceResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new TagResourceRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(tagResourceRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "CodeCommit");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "TagResource");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<TagResourceResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new TagResourceResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Tests the functionality of repository triggers by sending information to the trigger target. If real data is
@@ -3905,6 +4119,89 @@ final TestRepositoryTriggersResult executeTestRepositoryTriggers(TestRepositoryT
         }
     }
 
+    /**
+     * <p>
+     * Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=
+     * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @return Result of the UntagResource operation returned by the service.
+     * @throws RepositoryDoesNotExistException
+     *         The specified repository does not exist.
+     * @throws InvalidRepositoryNameException
+     *         At least one specified repository name is not valid.</p> <note>
+     *         <p>
+     *         This exception only occurs when a specified repository name is not valid. Other exceptions occur when a
+     *         required repository parameter is missing, or when a specified repository does not exist.
+     *         </p>
+     * @throws ResourceArnRequiredException
+     *         A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid
+     *         resources in AWS CodeCommit, see <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws InvalidResourceArnException
+     *         The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see
+     *         <a href=
+     *         "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+     *         >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+     * @throws TagKeysListRequiredException
+     *         A list of tag keys is required. The list cannot be empty or null.
+     * @throws InvalidTagKeysListException
+     *         The list of tags is not valid.
+     * @throws TooManyTagsException
+     *         The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+     * @throws InvalidSystemTagUsageException
+     *         The specified tag is not valid. Key names cannot be prefixed with aws:.
+     * @throws TagPolicyException
+     *         The tag policy is not valid.
+     * @sample AWSCodeCommit.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public UntagResourceResult untagResource(UntagResourceRequest request) {
+        request = beforeClientExecution(request);
+        return executeUntagResource(request);
+    }
+
+    @SdkInternalApi
+    final UntagResourceResult executeUntagResource(UntagResourceRequest untagResourceRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(untagResourceRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<UntagResourceRequest> request = null;
+        Response<UntagResourceResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new UntagResourceRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(untagResourceRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "CodeCommit");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UntagResource");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<UntagResourceResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new UntagResourceResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Replaces the contents of a comment.
@@ -4365,7 +4662,7 @@ final UpdateRepositoryDescriptionResult executeUpdateRepositoryDescription(Updat
      * Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository
      * names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters.
      * The suffix ".git" is prohibited. For a full description of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide.
      * </p>
      * 
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommit.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommit.java
index 83ff37b7d522..bbc8aeb8e5fd 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommit.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommit.java
@@ -167,6 +167,11 @@ public ListRepositoriesResult listRepositories(ListRepositoriesRequest request)
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public ListTagsForResourceResult listTagsForResource(ListTagsForResourceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public MergePullRequestByFastForwardResult mergePullRequestByFastForward(MergePullRequestByFastForwardRequest request) {
         throw new java.lang.UnsupportedOperationException();
@@ -197,11 +202,21 @@ public PutRepositoryTriggersResult putRepositoryTriggers(PutRepositoryTriggersRe
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public TagResourceResult tagResource(TagResourceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public TestRepositoryTriggersResult testRepositoryTriggers(TestRepositoryTriggersRequest request) {
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public UntagResourceResult untagResource(UntagResourceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public UpdateCommentResult updateComment(UpdateCommentRequest request) {
         throw new java.lang.UnsupportedOperationException();
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommitAsync.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommitAsync.java
index 2f6826dac877..0fd26ddd3327 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommitAsync.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/AbstractAWSCodeCommitAsync.java
@@ -365,6 +365,19 @@ public java.util.concurrent.Future<ListRepositoriesResult> listRepositoriesAsync
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest request) {
+
+        return listTagsForResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<MergePullRequestByFastForwardResult> mergePullRequestByFastForwardAsync(MergePullRequestByFastForwardRequest request) {
 
@@ -443,6 +456,19 @@ public java.util.concurrent.Future<PutRepositoryTriggersResult> putRepositoryTri
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest request) {
+
+        return tagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest request,
+            com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<TestRepositoryTriggersResult> testRepositoryTriggersAsync(TestRepositoryTriggersRequest request) {
 
@@ -456,6 +482,19 @@ public java.util.concurrent.Future<TestRepositoryTriggersResult> testRepositoryT
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest request) {
+
+        return untagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest request,
+            com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<UpdateCommentResult> updateCommentAsync(UpdateCommentRequest request) {
 
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/CreateRepositoryRequest.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/CreateRepositoryRequest.java
index 725716273f73..0e51baa1f0a7 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/CreateRepositoryRequest.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/CreateRepositoryRequest.java
@@ -37,7 +37,7 @@ public class CreateRepositoryRequest extends com.amazonaws.AmazonWebServiceReque
      * The repository name must be unique across the calling AWS account. In addition, repository names are limited to
      * 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description
      * of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide. The suffix ".git" is prohibited.
      * </p>
      * </note>
@@ -57,6 +57,12 @@ public class CreateRepositoryRequest extends com.amazonaws.AmazonWebServiceReque
      * </note>
      */
     private String repositoryDescription;
+    /**
+     * <p>
+     * One or more tag key-value pairs to use when tagging this repository.
+     * </p>
+     */
+    private java.util.Map<String, String> tags;
 
     /**
      * <p>
@@ -67,7 +73,7 @@ public class CreateRepositoryRequest extends com.amazonaws.AmazonWebServiceReque
      * The repository name must be unique across the calling AWS account. In addition, repository names are limited to
      * 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description
      * of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide. The suffix ".git" is prohibited.
      * </p>
      * </note>
@@ -78,8 +84,8 @@ public class CreateRepositoryRequest extends com.amazonaws.AmazonWebServiceReque
      *        The repository name must be unique across the calling AWS account. In addition, repository names are
      *        limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a
      *        full description of the limits on repository names, see <a
-     *        href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit
-     *        User Guide. The suffix ".git" is prohibited.
+     *        href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS
+     *        CodeCommit User Guide. The suffix ".git" is prohibited.
      *        </p>
      */
 
@@ -96,7 +102,7 @@ public void setRepositoryName(String repositoryName) {
      * The repository name must be unique across the calling AWS account. In addition, repository names are limited to
      * 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description
      * of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide. The suffix ".git" is prohibited.
      * </p>
      * </note>
@@ -106,7 +112,7 @@ public void setRepositoryName(String repositoryName) {
      *         The repository name must be unique across the calling AWS account. In addition, repository names are
      *         limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For
      *         a full description of the limits on repository names, see <a
-     *         href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS
+     *         href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS
      *         CodeCommit User Guide. The suffix ".git" is prohibited.
      *         </p>
      */
@@ -124,7 +130,7 @@ public String getRepositoryName() {
      * The repository name must be unique across the calling AWS account. In addition, repository names are limited to
      * 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description
      * of the limits on repository names, see <a
-     * href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
+     * href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit User
      * Guide. The suffix ".git" is prohibited.
      * </p>
      * </note>
@@ -135,8 +141,8 @@ public String getRepositoryName() {
      *        The repository name must be unique across the calling AWS account. In addition, repository names are
      *        limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a
      *        full description of the limits on repository names, see <a
-     *        href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS CodeCommit
-     *        User Guide. The suffix ".git" is prohibited.
+     *        href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">Limits</a> in the AWS
+     *        CodeCommit User Guide. The suffix ".git" is prohibited.
      *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
@@ -228,6 +234,67 @@ public CreateRepositoryRequest withRepositoryDescription(String repositoryDescri
         return this;
     }
 
+    /**
+     * <p>
+     * One or more tag key-value pairs to use when tagging this repository.
+     * </p>
+     * 
+     * @return One or more tag key-value pairs to use when tagging this repository.
+     */
+
+    public java.util.Map<String, String> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * One or more tag key-value pairs to use when tagging this repository.
+     * </p>
+     * 
+     * @param tags
+     *        One or more tag key-value pairs to use when tagging this repository.
+     */
+
+    public void setTags(java.util.Map<String, String> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * <p>
+     * One or more tag key-value pairs to use when tagging this repository.
+     * </p>
+     * 
+     * @param tags
+     *        One or more tag key-value pairs to use when tagging this repository.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateRepositoryRequest withTags(java.util.Map<String, String> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    public CreateRepositoryRequest addTagsEntry(String key, String value) {
+        if (null == this.tags) {
+            this.tags = new java.util.HashMap<String, String>();
+        }
+        if (this.tags.containsKey(key))
+            throw new IllegalArgumentException("Duplicated keys (" + key.toString() + ") are provided.");
+        this.tags.put(key, value);
+        return this;
+    }
+
+    /**
+     * Removes all the entries added into Tags.
+     *
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateRepositoryRequest clearTagsEntries() {
+        this.tags = null;
+        return this;
+    }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -243,7 +310,9 @@ public String toString() {
         if (getRepositoryName() != null)
             sb.append("RepositoryName: ").append(getRepositoryName()).append(",");
         if (getRepositoryDescription() != null)
-            sb.append("RepositoryDescription: ").append(getRepositoryDescription());
+            sb.append("RepositoryDescription: ").append(getRepositoryDescription()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
         sb.append("}");
         return sb.toString();
     }
@@ -266,6 +335,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getRepositoryDescription() != null && other.getRepositoryDescription().equals(this.getRepositoryDescription()) == false)
             return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
         return true;
     }
 
@@ -276,6 +349,7 @@ public int hashCode() {
 
         hashCode = prime * hashCode + ((getRepositoryName() == null) ? 0 : getRepositoryName().hashCode());
         hashCode = prime * hashCode + ((getRepositoryDescription() == null) ? 0 : getRepositoryDescription().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
         return hashCode;
     }
 
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/FileTooLargeException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/FileTooLargeException.java
index 075fad214348..87931ed0be08 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/FileTooLargeException.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/FileTooLargeException.java
@@ -17,7 +17,7 @@
 /**
  * <p>
  * The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS
- * CodeCommit, see <a href="http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS CodeCommit User
+ * CodeCommit, see <a href="https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html">AWS CodeCommit User
  * Guide</a>.
  * </p>
  */
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidResourceArnException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidResourceArnException.java
new file mode 100644
index 000000000000..c1397a5bcd63
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidResourceArnException.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=
+ * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+ * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InvalidResourceArnException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InvalidResourceArnException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InvalidResourceArnException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidSystemTagUsageException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidSystemTagUsageException.java
new file mode 100644
index 000000000000..3e43e5a79bee
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidSystemTagUsageException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The specified tag is not valid. Key names cannot be prefixed with aws:.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InvalidSystemTagUsageException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InvalidSystemTagUsageException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InvalidSystemTagUsageException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidTagKeysListException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidTagKeysListException.java
new file mode 100644
index 000000000000..2027df76e595
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidTagKeysListException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The list of tags is not valid.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InvalidTagKeysListException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InvalidTagKeysListException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InvalidTagKeysListException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidTagsMapException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidTagsMapException.java
new file mode 100644
index 000000000000..216876bf225b
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/InvalidTagsMapException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The map of tags is not valid.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InvalidTagsMapException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InvalidTagsMapException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InvalidTagsMapException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ListTagsForResourceRequest.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ListTagsForResourceRequest.java
new file mode 100644
index 000000000000..476c7f9154da
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ListTagsForResourceRequest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ListTagsForResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListTagsForResourceRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * An enumeration token that when provided in a request, returns the next batch of the results.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * An enumeration token that when provided in a request, returns the next batch of the results.
+     * </p>
+     * 
+     * @param nextToken
+     *        An enumeration token that when provided in a request, returns the next batch of the results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * An enumeration token that when provided in a request, returns the next batch of the results.
+     * </p>
+     * 
+     * @return An enumeration token that when provided in a request, returns the next batch of the results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * An enumeration token that when provided in a request, returns the next batch of the results.
+     * </p>
+     * 
+     * @param nextToken
+     *        An enumeration token that when provided in a request, returns the next batch of the results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListTagsForResourceRequest == false)
+            return false;
+        ListTagsForResourceRequest other = (ListTagsForResourceRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListTagsForResourceRequest clone() {
+        return (ListTagsForResourceRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ListTagsForResourceResult.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ListTagsForResourceResult.java
new file mode 100644
index 000000000000..d3bd62389805
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ListTagsForResourceResult.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/ListTagsForResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListTagsForResourceResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * A list of tag key and value pairs associated with the specified resource.
+     * </p>
+     */
+    private java.util.Map<String, String> tags;
+    /**
+     * <p>
+     * An enumeration token that allows the operation to batch the next results of the operation.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * A list of tag key and value pairs associated with the specified resource.
+     * </p>
+     * 
+     * @return A list of tag key and value pairs associated with the specified resource.
+     */
+
+    public java.util.Map<String, String> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * A list of tag key and value pairs associated with the specified resource.
+     * </p>
+     * 
+     * @param tags
+     *        A list of tag key and value pairs associated with the specified resource.
+     */
+
+    public void setTags(java.util.Map<String, String> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * <p>
+     * A list of tag key and value pairs associated with the specified resource.
+     * </p>
+     * 
+     * @param tags
+     *        A list of tag key and value pairs associated with the specified resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceResult withTags(java.util.Map<String, String> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    public ListTagsForResourceResult addTagsEntry(String key, String value) {
+        if (null == this.tags) {
+            this.tags = new java.util.HashMap<String, String>();
+        }
+        if (this.tags.containsKey(key))
+            throw new IllegalArgumentException("Duplicated keys (" + key.toString() + ") are provided.");
+        this.tags.put(key, value);
+        return this;
+    }
+
+    /**
+     * Removes all the entries added into Tags.
+     *
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceResult clearTagsEntries() {
+        this.tags = null;
+        return this;
+    }
+
+    /**
+     * <p>
+     * An enumeration token that allows the operation to batch the next results of the operation.
+     * </p>
+     * 
+     * @param nextToken
+     *        An enumeration token that allows the operation to batch the next results of the operation.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * An enumeration token that allows the operation to batch the next results of the operation.
+     * </p>
+     * 
+     * @return An enumeration token that allows the operation to batch the next results of the operation.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * An enumeration token that allows the operation to batch the next results of the operation.
+     * </p>
+     * 
+     * @param nextToken
+     *        An enumeration token that allows the operation to batch the next results of the operation.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListTagsForResourceResult == false)
+            return false;
+        ListTagsForResourceResult other = (ListTagsForResourceResult) obj;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListTagsForResourceResult clone() {
+        try {
+            return (ListTagsForResourceResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ResourceArnRequiredException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ResourceArnRequiredException.java
new file mode 100644
index 000000000000..4cf10584dbc3
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/ResourceArnRequiredException.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid resources in AWS
+ * CodeCommit, see <a href=
+ * "https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats"
+ * >CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResourceArnRequiredException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ResourceArnRequiredException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ResourceArnRequiredException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagKeysListRequiredException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagKeysListRequiredException.java
new file mode 100644
index 000000000000..da11cfd33e37
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagKeysListRequiredException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * A list of tag keys is required. The list cannot be empty or null.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagKeysListRequiredException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new TagKeysListRequiredException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public TagKeysListRequiredException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagPolicyException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagPolicyException.java
new file mode 100644
index 000000000000..5b1d86d650b4
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagPolicyException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The tag policy is not valid.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagPolicyException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new TagPolicyException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public TagPolicyException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagResourceRequest.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagResourceRequest.java
new file mode 100644
index 000000000000..9d9695cbcc7e
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagResourceRequest.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/TagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagResourceRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The key-value pair to use when tagging this repository.
+     * </p>
+     */
+    private java.util.Map<String, String> tags;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TagResourceRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The key-value pair to use when tagging this repository.
+     * </p>
+     * 
+     * @return The key-value pair to use when tagging this repository.
+     */
+
+    public java.util.Map<String, String> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * The key-value pair to use when tagging this repository.
+     * </p>
+     * 
+     * @param tags
+     *        The key-value pair to use when tagging this repository.
+     */
+
+    public void setTags(java.util.Map<String, String> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * <p>
+     * The key-value pair to use when tagging this repository.
+     * </p>
+     * 
+     * @param tags
+     *        The key-value pair to use when tagging this repository.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TagResourceRequest withTags(java.util.Map<String, String> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    public TagResourceRequest addTagsEntry(String key, String value) {
+        if (null == this.tags) {
+            this.tags = new java.util.HashMap<String, String>();
+        }
+        if (this.tags.containsKey(key))
+            throw new IllegalArgumentException("Duplicated keys (" + key.toString() + ") are provided.");
+        this.tags.put(key, value);
+        return this;
+    }
+
+    /**
+     * Removes all the entries added into Tags.
+     *
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TagResourceRequest clearTagsEntries() {
+        this.tags = null;
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof TagResourceRequest == false)
+            return false;
+        TagResourceRequest other = (TagResourceRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public TagResourceRequest clone() {
+        return (TagResourceRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagResourceResult.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagResourceResult.java
new file mode 100644
index 000000000000..06832b8cf05e
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagResourceResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/TagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagResourceResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof TagResourceResult == false)
+            return false;
+        TagResourceResult other = (TagResourceResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public TagResourceResult clone() {
+        try {
+            return (TagResourceResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagsMapRequiredException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagsMapRequiredException.java
new file mode 100644
index 000000000000..43cc219e6d78
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TagsMapRequiredException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * A map of tags is required.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagsMapRequiredException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new TagsMapRequiredException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public TagsMapRequiredException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TooManyTagsException.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TooManyTagsException.java
new file mode 100644
index 000000000000..7ae7b4a878e0
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/TooManyTagsException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The maximum number of tags for an AWS CodeCommit resource has been exceeded.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TooManyTagsException extends com.amazonaws.services.codecommit.model.AWSCodeCommitException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new TooManyTagsException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public TooManyTagsException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/UntagResourceRequest.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/UntagResourceRequest.java
new file mode 100644
index 000000000000..22db9434b7f3
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/UntagResourceRequest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/UntagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UntagResourceRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The tag key for each tag that you want to remove from the resource.
+     * </p>
+     */
+    private java.util.List<String> tagKeys;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the resource to which you want to remove tags.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UntagResourceRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The tag key for each tag that you want to remove from the resource.
+     * </p>
+     * 
+     * @return The tag key for each tag that you want to remove from the resource.
+     */
+
+    public java.util.List<String> getTagKeys() {
+        return tagKeys;
+    }
+
+    /**
+     * <p>
+     * The tag key for each tag that you want to remove from the resource.
+     * </p>
+     * 
+     * @param tagKeys
+     *        The tag key for each tag that you want to remove from the resource.
+     */
+
+    public void setTagKeys(java.util.Collection<String> tagKeys) {
+        if (tagKeys == null) {
+            this.tagKeys = null;
+            return;
+        }
+
+        this.tagKeys = new java.util.ArrayList<String>(tagKeys);
+    }
+
+    /**
+     * <p>
+     * The tag key for each tag that you want to remove from the resource.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override
+     * the existing values.
+     * </p>
+     * 
+     * @param tagKeys
+     *        The tag key for each tag that you want to remove from the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UntagResourceRequest withTagKeys(String... tagKeys) {
+        if (this.tagKeys == null) {
+            setTagKeys(new java.util.ArrayList<String>(tagKeys.length));
+        }
+        for (String ele : tagKeys) {
+            this.tagKeys.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The tag key for each tag that you want to remove from the resource.
+     * </p>
+     * 
+     * @param tagKeys
+     *        The tag key for each tag that you want to remove from the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UntagResourceRequest withTagKeys(java.util.Collection<String> tagKeys) {
+        setTagKeys(tagKeys);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getTagKeys() != null)
+            sb.append("TagKeys: ").append(getTagKeys());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UntagResourceRequest == false)
+            return false;
+        UntagResourceRequest other = (UntagResourceRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getTagKeys() == null ^ this.getTagKeys() == null)
+            return false;
+        if (other.getTagKeys() != null && other.getTagKeys().equals(this.getTagKeys()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getTagKeys() == null) ? 0 : getTagKeys().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UntagResourceRequest clone() {
+        return (UntagResourceRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/UntagResourceResult.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/UntagResourceResult.java
new file mode 100644
index 000000000000..6960aeb1da0e
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/UntagResourceResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/codecommit-2015-04-13/UntagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UntagResourceResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UntagResourceResult == false)
+            return false;
+        UntagResourceResult other = (UntagResourceResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public UntagResourceResult clone() {
+        try {
+            return (UntagResourceResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/CreateRepositoryRequestMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/CreateRepositoryRequestMarshaller.java
index 35c84cde46a1..012e75c095fc 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/CreateRepositoryRequestMarshaller.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/CreateRepositoryRequestMarshaller.java
@@ -12,6 +12,8 @@
  */
 package com.amazonaws.services.codecommit.model.transform;
 
+import java.util.Map;
+
 import javax.annotation.Generated;
 
 import com.amazonaws.SdkClientException;
@@ -31,6 +33,8 @@ public class CreateRepositoryRequestMarshaller {
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("repositoryName").build();
     private static final MarshallingInfo<String> REPOSITORYDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("repositoryDescription").build();
+    private static final MarshallingInfo<Map> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.MAP).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
 
     private static final CreateRepositoryRequestMarshaller instance = new CreateRepositoryRequestMarshaller();
 
@@ -50,6 +54,7 @@ public void marshall(CreateRepositoryRequest createRepositoryRequest, ProtocolMa
         try {
             protocolMarshaller.marshall(createRepositoryRequest.getRepositoryName(), REPOSITORYNAME_BINDING);
             protocolMarshaller.marshall(createRepositoryRequest.getRepositoryDescription(), REPOSITORYDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(createRepositoryRequest.getTags(), TAGS_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
         }
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceRequestMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceRequestMarshaller.java
new file mode 100644
index 000000000000..d7deaf8a635c
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceRequestMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.codecommit.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListTagsForResourceRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListTagsForResourceRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("nextToken").build();
+
+    private static final ListTagsForResourceRequestMarshaller instance = new ListTagsForResourceRequestMarshaller();
+
+    public static ListTagsForResourceRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListTagsForResourceRequest listTagsForResourceRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listTagsForResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listTagsForResourceRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(listTagsForResourceRequest.getNextToken(), NEXTTOKEN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceRequestProtocolMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..d2e7ec5e3232
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.codecommit.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListTagsForResourceRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListTagsForResourceRequestProtocolMarshaller implements Marshaller<Request<ListTagsForResourceRequest>, ListTagsForResourceRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.AWS_JSON).requestUri("/")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true)
+            .operationIdentifier("CodeCommit_20150413.ListTagsForResource").serviceName("AWSCodeCommit").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListTagsForResourceRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListTagsForResourceRequest> marshall(ListTagsForResourceRequest listTagsForResourceRequest) {
+
+        if (listTagsForResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListTagsForResourceRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    listTagsForResourceRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListTagsForResourceRequestMarshaller.getInstance().marshall(listTagsForResourceRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceResultJsonUnmarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..373698a4c369
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/ListTagsForResourceResultJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.codecommit.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListTagsForResourceResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListTagsForResourceResultJsonUnmarshaller implements Unmarshaller<ListTagsForResourceResult, JsonUnmarshallerContext> {
+
+    public ListTagsForResourceResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListTagsForResourceResult listTagsForResourceResult = new ListTagsForResourceResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listTagsForResourceResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("tags", targetDepth)) {
+                    context.nextToken();
+                    listTagsForResourceResult.setTags(new MapUnmarshaller<String, String>(context.getUnmarshaller(String.class), context
+                            .getUnmarshaller(String.class)).unmarshall(context));
+                }
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listTagsForResourceResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listTagsForResourceResult;
+    }
+
+    private static ListTagsForResourceResultJsonUnmarshaller instance;
+
+    public static ListTagsForResourceResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListTagsForResourceResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceRequestMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceRequestMarshaller.java
new file mode 100644
index 000000000000..632c20b87f18
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceRequestMarshaller.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import java.util.Map;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.codecommit.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TagResourceRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TagResourceRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<Map> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.MAP).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
+
+    private static final TagResourceRequestMarshaller instance = new TagResourceRequestMarshaller();
+
+    public static TagResourceRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(TagResourceRequest tagResourceRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (tagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(tagResourceRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(tagResourceRequest.getTags(), TAGS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceRequestProtocolMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..6a13f06d9d7a
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.codecommit.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TagResourceRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TagResourceRequestProtocolMarshaller implements Marshaller<Request<TagResourceRequest>, TagResourceRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.AWS_JSON).requestUri("/")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).operationIdentifier("CodeCommit_20150413.TagResource")
+            .serviceName("AWSCodeCommit").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public TagResourceRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<TagResourceRequest> marshall(TagResourceRequest tagResourceRequest) {
+
+        if (tagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<TagResourceRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    tagResourceRequest);
+
+            protocolMarshaller.startMarshalling();
+            TagResourceRequestMarshaller.getInstance().marshall(tagResourceRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceResultJsonUnmarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..efb6b351d6fe
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/TagResourceResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.codecommit.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * TagResourceResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagResourceResultJsonUnmarshaller implements Unmarshaller<TagResourceResult, JsonUnmarshallerContext> {
+
+    public TagResourceResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        TagResourceResult tagResourceResult = new TagResourceResult();
+
+        return tagResourceResult;
+    }
+
+    private static TagResourceResultJsonUnmarshaller instance;
+
+    public static TagResourceResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TagResourceResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceRequestMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceRequestMarshaller.java
new file mode 100644
index 000000000000..54e828b3915c
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceRequestMarshaller.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.codecommit.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UntagResourceRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UntagResourceRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<List> TAGKEYS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tagKeys").build();
+
+    private static final UntagResourceRequestMarshaller instance = new UntagResourceRequestMarshaller();
+
+    public static UntagResourceRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UntagResourceRequest untagResourceRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (untagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(untagResourceRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(untagResourceRequest.getTagKeys(), TAGKEYS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceRequestProtocolMarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..4da295bb9789
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.codecommit.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UntagResourceRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UntagResourceRequestProtocolMarshaller implements Marshaller<Request<UntagResourceRequest>, UntagResourceRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.AWS_JSON).requestUri("/")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true)
+            .operationIdentifier("CodeCommit_20150413.UntagResource").serviceName("AWSCodeCommit").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public UntagResourceRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<UntagResourceRequest> marshall(UntagResourceRequest untagResourceRequest) {
+
+        if (untagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<UntagResourceRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    untagResourceRequest);
+
+            protocolMarshaller.startMarshalling();
+            UntagResourceRequestMarshaller.getInstance().marshall(untagResourceRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceResultJsonUnmarshaller.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..a2622b361899
--- /dev/null
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/model/transform/UntagResourceResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.codecommit.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.codecommit.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UntagResourceResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UntagResourceResultJsonUnmarshaller implements Unmarshaller<UntagResourceResult, JsonUnmarshallerContext> {
+
+    public UntagResourceResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UntagResourceResult untagResourceResult = new UntagResourceResult();
+
+        return untagResourceResult;
+    }
+
+    private static UntagResourceResultJsonUnmarshaller instance;
+
+    public static UntagResourceResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UntagResourceResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/package-info.java b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/package-info.java
index 651e2d4e22cb..3919a4057782 100644
--- a/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/package-info.java
+++ b/aws-java-sdk-codecommit/src/main/java/com/amazonaws/services/codecommit/package-info.java
@@ -244,6 +244,27 @@
  * </li>
  * </ul>
  * <p>
+ * Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:
+ * </p>
+ * <ul>
+ * <li>
+ * <p>
+ * <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS
+ * CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.
+ * </p>
+ * </li>
+ * </ul>
+ * <p>
  * Triggers, by calling the following:
  * </p>
  * <ul>
@@ -267,7 +288,7 @@
  * </ul>
  * <p>
  * For information about how to use AWS CodeCommit, see the <a
- * href="http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
+ * href="https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html">AWS CodeCommit User Guide</a>.
  * </p>
  */
 package com.amazonaws.services.codecommit;
diff --git a/aws-java-sdk-codedeploy/pom.xml b/aws-java-sdk-codedeploy/pom.xml
index c4335732abb5..1fdc56aa1540 100644
--- a/aws-java-sdk-codedeploy/pom.xml
+++ b/aws-java-sdk-codedeploy/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codedeploy</artifactId>
diff --git a/aws-java-sdk-codegen-maven-plugin/pom.xml b/aws-java-sdk-codegen-maven-plugin/pom.xml
index 2cea99c2aa4c..869144e0902e 100644
--- a/aws-java-sdk-codegen-maven-plugin/pom.xml
+++ b/aws-java-sdk-codegen-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codegen-maven-plugin</artifactId>
diff --git a/aws-java-sdk-codepipeline/pom.xml b/aws-java-sdk-codepipeline/pom.xml
index cab85ca3942c..ba2426b6aeff 100644
--- a/aws-java-sdk-codepipeline/pom.xml
+++ b/aws-java-sdk-codepipeline/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codepipeline</artifactId>
diff --git a/aws-java-sdk-codestar/pom.xml b/aws-java-sdk-codestar/pom.xml
index 82b40810257a..a51a5e361ba7 100644
--- a/aws-java-sdk-codestar/pom.xml
+++ b/aws-java-sdk-codestar/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codestar</artifactId>
diff --git a/aws-java-sdk-cognitoidentity/pom.xml b/aws-java-sdk-cognitoidentity/pom.xml
index c8377a259bdb..0eca34dbd611 100644
--- a/aws-java-sdk-cognitoidentity/pom.xml
+++ b/aws-java-sdk-cognitoidentity/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cognitoidentity</artifactId>
diff --git a/aws-java-sdk-cognitoidp/pom.xml b/aws-java-sdk-cognitoidp/pom.xml
index 7fa6e0a4148d..f1e7f152c057 100644
--- a/aws-java-sdk-cognitoidp/pom.xml
+++ b/aws-java-sdk-cognitoidp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cognitoidp</artifactId>
diff --git a/aws-java-sdk-cognitosync/pom.xml b/aws-java-sdk-cognitosync/pom.xml
index cb74d6151822..047f37b3b113 100644
--- a/aws-java-sdk-cognitosync/pom.xml
+++ b/aws-java-sdk-cognitosync/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cognitosync</artifactId>
diff --git a/aws-java-sdk-comprehend/pom.xml b/aws-java-sdk-comprehend/pom.xml
index 1c1d97168422..c42302e61974 100644
--- a/aws-java-sdk-comprehend/pom.xml
+++ b/aws-java-sdk-comprehend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-comprehend</artifactId>
diff --git a/aws-java-sdk-comprehendmedical/pom.xml b/aws-java-sdk-comprehendmedical/pom.xml
index 4722ccb74698..f8b6fa06e23d 100644
--- a/aws-java-sdk-comprehendmedical/pom.xml
+++ b/aws-java-sdk-comprehendmedical/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-comprehendmedical</artifactId>
diff --git a/aws-java-sdk-config/pom.xml b/aws-java-sdk-config/pom.xml
index 7094ad2a7ed0..00dec7591492 100644
--- a/aws-java-sdk-config/pom.xml
+++ b/aws-java-sdk-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-config</artifactId>
diff --git a/aws-java-sdk-connect/pom.xml b/aws-java-sdk-connect/pom.xml
index 9d3913315721..dd26c1978c4f 100644
--- a/aws-java-sdk-connect/pom.xml
+++ b/aws-java-sdk-connect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-connect</artifactId>
diff --git a/aws-java-sdk-core/pom.xml b/aws-java-sdk-core/pom.xml
index a7f94fac51cd..3c8bf7ef49be 100644
--- a/aws-java-sdk-core/pom.xml
+++ b/aws-java-sdk-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-core</artifactId>
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/EC2CredentialsFetcher.java b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/EC2CredentialsFetcher.java
index 2116dad76687..587a7f2fd197 100644
--- a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/EC2CredentialsFetcher.java
+++ b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/EC2CredentialsFetcher.java
@@ -123,7 +123,7 @@ private synchronized void fetchCredentials() {
                 credentialsEndpointProvider.getRetryPolicy(),
                 credentialsEndpointProvider.getHeaders());
 
-            node = Jackson.jsonNodeOf(credentialsResponse);
+            node = Jackson.fromSensitiveJsonString(credentialsResponse, JsonNode.class);
             accessKey = node.get(ACCESS_KEY_ID);
             secretKey = node.get(SECRET_ACCESS_KEY);
             token = node.get(TOKEN);
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/ProcessCredentialsProvider.java b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/ProcessCredentialsProvider.java
index e88a6c621a17..61ec710d7b9d 100644
--- a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/ProcessCredentialsProvider.java
+++ b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/ProcessCredentialsProvider.java
@@ -139,7 +139,7 @@ private boolean credentialsNeedUpdating() {
      * Parse the output from the credentials process.
      */
     private JsonNode parseProcessOutput(String processOutput) {
-        JsonNode credentialsJson = Jackson.jsonNodeOf(processOutput);
+        JsonNode credentialsJson = Jackson.fromSensitiveJsonString(processOutput, JsonNode.class);
 
         if (!credentialsJson.isObject()) {
             throw new IllegalStateException("Process did not return a JSON object.");
@@ -161,7 +161,7 @@ private AWSCredentials credentials(JsonNode credentialsJson) {
         String sessionToken = getText(credentialsJson, "SessionToken");
 
         ValidationUtils.assertStringNotEmpty(accessKeyId, "AccessKeyId");
-        ValidationUtils.assertStringNotEmpty(accessKeyId, "SecretAccessKey");
+        ValidationUtils.assertStringNotEmpty(secretAccessKey, "SecretAccessKey");
 
         if (sessionToken != null) {
             return new BasicSessionCredentials(accessKeyId, secretAccessKey, sessionToken);
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/ProfilesConfigFileWriter.java b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/ProfilesConfigFileWriter.java
index e314a5a63dd5..6d9c55ada569 100644
--- a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/ProfilesConfigFileWriter.java
+++ b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/ProfilesConfigFileWriter.java
@@ -174,7 +174,7 @@ static void modifyProfiles(File destination, Map<String, Profile> modifications)
 
                 if (LOG.isDebugEnabled()) {
                     LOG.debug(String
-                            .format("The original credentials file is stashed to loaction (%s).",
+                            .format("The original credentials file is stashed to location (%s).",
                                     stashLocation.getAbsolutePath()));
                 }
 
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/internal/AbstractProfilesConfigFileScanner.java b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/internal/AbstractProfilesConfigFileScanner.java
index 2e5e885894b5..571a41ec10f4 100644
--- a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/internal/AbstractProfilesConfigFileScanner.java
+++ b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/profile/internal/AbstractProfilesConfigFileScanner.java
@@ -90,7 +90,9 @@ protected void run(Scanner scanner) {
         String currentProfileName = null;
 
         try {
+            int lineNumber = 0;
             while(scanner.hasNextLine()) {
+                ++lineNumber;
                 String line = scanner.nextLine().trim();
 
                 // Empty or comment lines
@@ -114,12 +116,11 @@ protected void run(Scanner scanner) {
                     currentProfileName = newProfileName;
                 } else {
                     // Parse the property line
-                    Entry<String, String> property = parsePropertyLine(line);
+                    Entry<String, String> property = parsePropertyLine(line, lineNumber);
 
                     if (currentProfileName == null) {
-                        throw new IllegalArgumentException(
-                                "Property is defined without a preceding profile name. "
-                                + "Current line: " + line);
+                        throw new IllegalArgumentException("Property is defined without a preceding profile name on line " +
+                                                           lineNumber);
                     }
 
                     onProfileProperty(currentProfileName,
@@ -155,12 +156,10 @@ private static String parseProfileName(String trimmedLine) {
         return null;
     }
 
-    private static Entry<String, String> parsePropertyLine(String propertyLine) {
+    private static Entry<String, String> parsePropertyLine(String propertyLine, int lineNumber) {
         String[] pair = propertyLine.split("=", 2);
         if (pair.length != 2) {
-            throw new IllegalArgumentException(
-                    "Invalid property format: no '=' character is found in the line ["
-                    + propertyLine + "].");
+            throw new IllegalArgumentException("Invalid property format: no '=' character is found on line " + lineNumber);
         }
 
         String propertyKey   = pair[0].trim();
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/util/json/Jackson.java b/aws-java-sdk-core/src/main/java/com/amazonaws/util/json/Jackson.java
index 717040b37e22..d9539a717228 100644
--- a/aws-java-sdk-core/src/main/java/com/amazonaws/util/json/Jackson.java
+++ b/aws-java-sdk-core/src/main/java/com/amazonaws/util/json/Jackson.java
@@ -14,6 +14,10 @@
  */
 package com.amazonaws.util.json;
 
+import com.amazonaws.log.InternalLogApi;
+import com.amazonaws.log.InternalLogFactory;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
@@ -29,11 +33,12 @@
 
 public enum Jackson {
     ;
+    private static final InternalLogApi log = InternalLogFactory.getLog(Jackson.class);
     private static final ObjectMapper objectMapper = new ObjectMapper();
     static {
         objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    };
+    }
     private static final ObjectWriter writer = objectMapper.writer();
     private static final ObjectWriter prettyWriter = objectMapper.writerWithDefaultPrettyPrinter();
 
@@ -67,6 +72,28 @@ public static <T> T fromJsonString(String json, Class<T> clazz) {
         }
     }
 
+    /**
+     * Returns the deserialized object from the given json string and target
+     * class; or null if the given json string is null. Clears the JSON location in the event of an error
+     */
+    public static <T> T fromSensitiveJsonString(String json, Class<T> clazz) {
+        if (json == null) {
+            return null;
+        }
+        try {
+            return objectMapper.readValue(json, clazz);
+        } catch (IOException e) {
+            // If underlying exception is a json parsing issue, clear out the location so that the exception message
+            // does not contain the raw json
+            if (e instanceof JsonProcessingException) {
+                log.debug("Failed to parse JSON string.", e);
+                throw new SdkClientException("Unable to parse Json string. See debug-level logs for the exact error " +
+                                             "details, which may include sensitive information.");
+            }
+            throw new SdkClientException("Unable to parse Json String.", e);
+        }
+    }
+
     public static JsonNode jsonNodeOf(String json) {
         return fromJsonString(json, JsonNode.class);
     }
diff --git a/aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json b/aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json
index b1b7701d2399..ac92fd1fe1e2 100644
--- a/aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json
+++ b/aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json
@@ -849,7 +849,10 @@
       },
       "comprehendmedical" : {
         "endpoints" : {
+          "ap-southeast-2" : { },
+          "ca-central-1" : { },
           "eu-west-1" : { },
+          "eu-west-2" : { },
           "us-east-1" : { },
           "us-east-2" : { },
           "us-west-2" : { }
@@ -1567,6 +1570,20 @@
           "us-west-2" : { }
         }
       },
+      "iotthingsgraph" : {
+        "defaults" : {
+          "credentialScope" : {
+            "service" : "iotthingsgraph"
+          }
+        },
+        "endpoints" : {
+          "ap-northeast-1" : { },
+          "ap-southeast-2" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-west-2" : { }
+        }
+      },
       "kafka" : {
         "endpoints" : {
           "ap-northeast-1" : { },
diff --git a/aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties b/aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties
index 2d5a743c8263..f4930625c225 100644
--- a/aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties
+++ b/aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties
@@ -1,4 +1,4 @@
-#Wed May 29 19:58:47 UTC 2019
+#Thu May 30 20:47:21 UTC 2019
 platform=java
-version=1.11.562
-internalVersion=5817786500
+version=1.11.563
+internalVersion=5817986601
diff --git a/aws-java-sdk-core/src/test/java/com/amazonaws/auth/ContainerCredentialsProviderTest.java b/aws-java-sdk-core/src/test/java/com/amazonaws/auth/ContainerCredentialsProviderTest.java
index 98bbab7ad07f..a59ab317896a 100644
--- a/aws-java-sdk-core/src/test/java/com/amazonaws/auth/ContainerCredentialsProviderTest.java
+++ b/aws-java-sdk-core/src/test/java/com/amazonaws/auth/ContainerCredentialsProviderTest.java
@@ -15,6 +15,7 @@
 package com.amazonaws.auth;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
@@ -25,6 +26,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
@@ -93,6 +95,24 @@ public void testGetCredentialsReturnsValidResponseFromEcsEndpoint() {
         Assert.assertEquals(new DateTime(EXPIRATION_DATE).toDate(), containerCredentialsProvider.getCredentialsExpiration());
     }
 
+    /**
+     * Tests that the getCredentials won't leak credentials data if the response from ECS is corrupted.
+     */
+    @Test
+    public void getCredentialsWithCorruptResponseDoesNotIncludeCredentialsInExceptionMessage() {
+        stubForCorruptedSuccessResponse();
+
+        try {
+            containerCredentialsProvider.getCredentials();
+            Assert.fail();
+        } catch (Exception e) {
+            String stackTrace = ExceptionUtils.getStackTrace(e);
+            Assert.assertFalse(stackTrace.contains("ACCESS_KEY_ID"));
+            Assert.assertFalse(stackTrace.contains("SECRET_ACCESS_KEY"));
+            Assert.assertFalse(stackTrace.contains("TOKEN_TOKEN_TOKEN"));
+        }
+    }
+
     /**
      * Tests when the response is 404 Not found,
      * then getCredentials method throws an AmazonClientException.
@@ -125,17 +145,29 @@ public void testGetCredentialsThrowsAseForNon200AndNon404ErrorResponse() {
         }
     }
 
+    private void stubForSuccessResponse() {
+        stubFor200Response(getSuccessfulBody());
+    }
+
+    private void stubForCorruptedSuccessResponse() {
+        String body = getSuccessfulBody();
+        stubFor200Response(body.substring(0, body.length() - 2));
+    }
 
+    private void stubFor200Response(String body) {
+        stubFor(get(urlPathEqualTo(CREDENTIALS_PATH))
+                        .willReturn(aResponse()
+                                            .withStatus(200)
+                                            .withHeader("Content-Type", "application/json")
+                                            .withHeader("charset", "utf-8")
+                                            .withBody(body)));
+    }
 
-    private void stubForSuccessResponse() {
-        stubFor(
-                get(urlPathEqualTo(CREDENTIALS_PATH))
-                .willReturn(aResponse()
-                                .withStatus(200)
-                                .withHeader("Content-Type", "application/json")
-                                .withHeader("charset", "utf-8")
-                                .withBody("{\"AccessKeyId\":\"ACCESS_KEY_ID\",\"SecretAccessKey\":\"SECRET_ACCESS_KEY\",\"Token\":\"TOKEN_TOKEN_TOKEN\","
-                                        + "\"Expiration\":\"3000-05-03T04:55:54Z\"}")));
+    private String getSuccessfulBody() {
+        return "{\"AccessKeyId\":\"ACCESS_KEY_ID\"," +
+               "\"SecretAccessKey\":\"SECRET_ACCESS_KEY\"," +
+               "\"Token\":\"TOKEN_TOKEN_TOKEN\"," +
+               "\"Expiration\":\"3000-05-03T04:55:54Z\"}";
     }
 
     private void stubForErrorResponse(int statusCode) {
diff --git a/aws-java-sdk-costandusagereport/pom.xml b/aws-java-sdk-costandusagereport/pom.xml
index 186ebc5b90bb..b6a044133674 100644
--- a/aws-java-sdk-costandusagereport/pom.xml
+++ b/aws-java-sdk-costandusagereport/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-costandusagereport</artifactId>
diff --git a/aws-java-sdk-costexplorer/pom.xml b/aws-java-sdk-costexplorer/pom.xml
index 897a22a81ce0..ff9417c7bbeb 100644
--- a/aws-java-sdk-costexplorer/pom.xml
+++ b/aws-java-sdk-costexplorer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-costexplorer</artifactId>
diff --git a/aws-java-sdk-datapipeline/pom.xml b/aws-java-sdk-datapipeline/pom.xml
index 2b8be959b165..434f5f67197b 100644
--- a/aws-java-sdk-datapipeline/pom.xml
+++ b/aws-java-sdk-datapipeline/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-datapipeline</artifactId>
diff --git a/aws-java-sdk-datasync/pom.xml b/aws-java-sdk-datasync/pom.xml
index ddc10b721584..76f526fd4959 100644
--- a/aws-java-sdk-datasync/pom.xml
+++ b/aws-java-sdk-datasync/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-datasync</artifactId>
diff --git a/aws-java-sdk-dax/pom.xml b/aws-java-sdk-dax/pom.xml
index d20658de6c83..035a77140501 100644
--- a/aws-java-sdk-dax/pom.xml
+++ b/aws-java-sdk-dax/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-dax</artifactId>
diff --git a/aws-java-sdk-devicefarm/pom.xml b/aws-java-sdk-devicefarm/pom.xml
index b61b6fcbfdd4..20dbb2553136 100644
--- a/aws-java-sdk-devicefarm/pom.xml
+++ b/aws-java-sdk-devicefarm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-devicefarm</artifactId>
diff --git a/aws-java-sdk-directconnect/pom.xml b/aws-java-sdk-directconnect/pom.xml
index 03dd94eae62f..94fac7c99d11 100644
--- a/aws-java-sdk-directconnect/pom.xml
+++ b/aws-java-sdk-directconnect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-directconnect</artifactId>
diff --git a/aws-java-sdk-directory/pom.xml b/aws-java-sdk-directory/pom.xml
index 78efa6dbd051..1cb703d7867e 100644
--- a/aws-java-sdk-directory/pom.xml
+++ b/aws-java-sdk-directory/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-directory</artifactId>
diff --git a/aws-java-sdk-discovery/pom.xml b/aws-java-sdk-discovery/pom.xml
index 3b5b12eb6ee5..38ed89e00a8b 100644
--- a/aws-java-sdk-discovery/pom.xml
+++ b/aws-java-sdk-discovery/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-discovery</artifactId>
diff --git a/aws-java-sdk-dlm/pom.xml b/aws-java-sdk-dlm/pom.xml
index 19473ca14f7a..d7d172baac49 100644
--- a/aws-java-sdk-dlm/pom.xml
+++ b/aws-java-sdk-dlm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-dlm</artifactId>
diff --git a/aws-java-sdk-dms/pom.xml b/aws-java-sdk-dms/pom.xml
index 3cc5d32d43e6..41a87125d730 100644
--- a/aws-java-sdk-dms/pom.xml
+++ b/aws-java-sdk-dms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-dms</artifactId>
diff --git a/aws-java-sdk-docdb/pom.xml b/aws-java-sdk-docdb/pom.xml
index 5110c01cde39..2a32b324da34 100644
--- a/aws-java-sdk-docdb/pom.xml
+++ b/aws-java-sdk-docdb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-docdb</artifactId>
diff --git a/aws-java-sdk-dynamodb/pom.xml b/aws-java-sdk-dynamodb/pom.xml
index 0bc31d9c390d..b7ab359a3eab 100644
--- a/aws-java-sdk-dynamodb/pom.xml
+++ b/aws-java-sdk-dynamodb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-dynamodb</artifactId>
diff --git a/aws-java-sdk-ec2/pom.xml b/aws-java-sdk-ec2/pom.xml
index 2ba5567d2809..11422920e8d3 100644
--- a/aws-java-sdk-ec2/pom.xml
+++ b/aws-java-sdk-ec2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-ec2</artifactId>
diff --git a/aws-java-sdk-ecr/pom.xml b/aws-java-sdk-ecr/pom.xml
index b4b38e2e99de..0551d2c21a2f 100644
--- a/aws-java-sdk-ecr/pom.xml
+++ b/aws-java-sdk-ecr/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-ecr</artifactId>
diff --git a/aws-java-sdk-ecs/pom.xml b/aws-java-sdk-ecs/pom.xml
index b22522472abb..68f8dc188afd 100644
--- a/aws-java-sdk-ecs/pom.xml
+++ b/aws-java-sdk-ecs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-ecs</artifactId>
diff --git a/aws-java-sdk-efs/pom.xml b/aws-java-sdk-efs/pom.xml
index ca653cfe2840..fd21282964ac 100644
--- a/aws-java-sdk-efs/pom.xml
+++ b/aws-java-sdk-efs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-efs</artifactId>
diff --git a/aws-java-sdk-eks/pom.xml b/aws-java-sdk-eks/pom.xml
index 22153863c786..4e40f55d4b77 100644
--- a/aws-java-sdk-eks/pom.xml
+++ b/aws-java-sdk-eks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-eks</artifactId>
diff --git a/aws-java-sdk-elasticache/pom.xml b/aws-java-sdk-elasticache/pom.xml
index 982533596ceb..1c1fc541b46c 100644
--- a/aws-java-sdk-elasticache/pom.xml
+++ b/aws-java-sdk-elasticache/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-elasticache</artifactId>
diff --git a/aws-java-sdk-elasticbeanstalk/pom.xml b/aws-java-sdk-elasticbeanstalk/pom.xml
index d9af534072fb..70d5a6e1ddee 100644
--- a/aws-java-sdk-elasticbeanstalk/pom.xml
+++ b/aws-java-sdk-elasticbeanstalk/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-elasticbeanstalk</artifactId>
diff --git a/aws-java-sdk-elasticloadbalancing/pom.xml b/aws-java-sdk-elasticloadbalancing/pom.xml
index 1537770141c6..761a64a950cc 100644
--- a/aws-java-sdk-elasticloadbalancing/pom.xml
+++ b/aws-java-sdk-elasticloadbalancing/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-elasticloadbalancing</artifactId>
diff --git a/aws-java-sdk-elasticloadbalancingv2/pom.xml b/aws-java-sdk-elasticloadbalancingv2/pom.xml
index 2a4c782f2325..ce9254d79baf 100644
--- a/aws-java-sdk-elasticloadbalancingv2/pom.xml
+++ b/aws-java-sdk-elasticloadbalancingv2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-elasticloadbalancingv2</artifactId>
diff --git a/aws-java-sdk-elasticsearch/pom.xml b/aws-java-sdk-elasticsearch/pom.xml
index 3161e5bddb72..a213ea8fc233 100644
--- a/aws-java-sdk-elasticsearch/pom.xml
+++ b/aws-java-sdk-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-elasticsearch</artifactId>
diff --git a/aws-java-sdk-elastictranscoder/pom.xml b/aws-java-sdk-elastictranscoder/pom.xml
index 1ef862ed79da..9d11537d7855 100644
--- a/aws-java-sdk-elastictranscoder/pom.xml
+++ b/aws-java-sdk-elastictranscoder/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-elastictranscoder</artifactId>
diff --git a/aws-java-sdk-emr/pom.xml b/aws-java-sdk-emr/pom.xml
index aa970887f3ae..3622b29dfedc 100644
--- a/aws-java-sdk-emr/pom.xml
+++ b/aws-java-sdk-emr/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-emr</artifactId>
diff --git a/aws-java-sdk-events/pom.xml b/aws-java-sdk-events/pom.xml
index 9e1a2d9eff55..343ff3206943 100644
--- a/aws-java-sdk-events/pom.xml
+++ b/aws-java-sdk-events/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-events</artifactId>
diff --git a/aws-java-sdk-fms/pom.xml b/aws-java-sdk-fms/pom.xml
index b23a66b1e6cb..fa5371b09fee 100644
--- a/aws-java-sdk-fms/pom.xml
+++ b/aws-java-sdk-fms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-fms</artifactId>
diff --git a/aws-java-sdk-fsx/pom.xml b/aws-java-sdk-fsx/pom.xml
index 154b2625132b..babdbf5e14bf 100644
--- a/aws-java-sdk-fsx/pom.xml
+++ b/aws-java-sdk-fsx/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-fsx</artifactId>
diff --git a/aws-java-sdk-gamelift/pom.xml b/aws-java-sdk-gamelift/pom.xml
index 188ba0e6017c..1eb14e7ae435 100644
--- a/aws-java-sdk-gamelift/pom.xml
+++ b/aws-java-sdk-gamelift/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-gamelift</artifactId>
diff --git a/aws-java-sdk-glacier/pom.xml b/aws-java-sdk-glacier/pom.xml
index 498750832583..37e1d141fbea 100644
--- a/aws-java-sdk-glacier/pom.xml
+++ b/aws-java-sdk-glacier/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-glacier</artifactId>
diff --git a/aws-java-sdk-globalaccelerator/pom.xml b/aws-java-sdk-globalaccelerator/pom.xml
index 0108b1416c6b..c3d6b92436c9 100644
--- a/aws-java-sdk-globalaccelerator/pom.xml
+++ b/aws-java-sdk-globalaccelerator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-globalaccelerator</artifactId>
diff --git a/aws-java-sdk-glue/pom.xml b/aws-java-sdk-glue/pom.xml
index d35d36842eca..0c3e018bcf01 100644
--- a/aws-java-sdk-glue/pom.xml
+++ b/aws-java-sdk-glue/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-glue</artifactId>
diff --git a/aws-java-sdk-greengrass/pom.xml b/aws-java-sdk-greengrass/pom.xml
index ec78838bd6a4..53cbf40eac6e 100644
--- a/aws-java-sdk-greengrass/pom.xml
+++ b/aws-java-sdk-greengrass/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-greengrass</artifactId>
diff --git a/aws-java-sdk-groundstation/pom.xml b/aws-java-sdk-groundstation/pom.xml
index 2690df60bf15..b1af8ed5c5b6 100644
--- a/aws-java-sdk-groundstation/pom.xml
+++ b/aws-java-sdk-groundstation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-groundstation</artifactId>
diff --git a/aws-java-sdk-guardduty/pom.xml b/aws-java-sdk-guardduty/pom.xml
index f539fa38f4d3..ad44c66eedb3 100644
--- a/aws-java-sdk-guardduty/pom.xml
+++ b/aws-java-sdk-guardduty/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-guardduty</artifactId>
diff --git a/aws-java-sdk-health/pom.xml b/aws-java-sdk-health/pom.xml
index 122582e0258c..34caad1a19c3 100644
--- a/aws-java-sdk-health/pom.xml
+++ b/aws-java-sdk-health/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-health</artifactId>
diff --git a/aws-java-sdk-iam/pom.xml b/aws-java-sdk-iam/pom.xml
index 1efa9ef8c089..dc19a3773206 100644
--- a/aws-java-sdk-iam/pom.xml
+++ b/aws-java-sdk-iam/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iam</artifactId>
diff --git a/aws-java-sdk-importexport/pom.xml b/aws-java-sdk-importexport/pom.xml
index 2a74321c25f7..30527a058bf8 100644
--- a/aws-java-sdk-importexport/pom.xml
+++ b/aws-java-sdk-importexport/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-importexport</artifactId>
diff --git a/aws-java-sdk-inspector/pom.xml b/aws-java-sdk-inspector/pom.xml
index 10cc992df754..0d3356c43a2f 100644
--- a/aws-java-sdk-inspector/pom.xml
+++ b/aws-java-sdk-inspector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-inspector</artifactId>
diff --git a/aws-java-sdk-iot/pom.xml b/aws-java-sdk-iot/pom.xml
index ef979c8105c5..d9982a665acd 100644
--- a/aws-java-sdk-iot/pom.xml
+++ b/aws-java-sdk-iot/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iot</artifactId>
diff --git a/aws-java-sdk-iot1clickdevices/pom.xml b/aws-java-sdk-iot1clickdevices/pom.xml
index 4216160ce79d..e4fa847143e8 100644
--- a/aws-java-sdk-iot1clickdevices/pom.xml
+++ b/aws-java-sdk-iot1clickdevices/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iot1clickdevices</artifactId>
diff --git a/aws-java-sdk-iot1clickprojects/pom.xml b/aws-java-sdk-iot1clickprojects/pom.xml
index b361ed93d11e..46dde8256a98 100644
--- a/aws-java-sdk-iot1clickprojects/pom.xml
+++ b/aws-java-sdk-iot1clickprojects/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iot1clickprojects</artifactId>
diff --git a/aws-java-sdk-iotanalytics/pom.xml b/aws-java-sdk-iotanalytics/pom.xml
index 16bf3a57a7f4..f4001f5b96cb 100644
--- a/aws-java-sdk-iotanalytics/pom.xml
+++ b/aws-java-sdk-iotanalytics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iotanalytics</artifactId>
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Channel.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Channel.java
index 4904f4a582bf..07310e46ac43 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Channel.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Channel.java
@@ -35,6 +35,12 @@ public class Channel implements Serializable, Cloneable, StructuredPojo {
      * </p>
      */
     private String name;
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     */
+    private ChannelStorage storage;
     /**
      * <p>
      * The ARN of the channel.
@@ -106,6 +112,46 @@ public Channel withName(String name) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param storage
+     *        Where channel data is stored.
+     */
+
+    public void setStorage(ChannelStorage storage) {
+        this.storage = storage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @return Where channel data is stored.
+     */
+
+    public ChannelStorage getStorage() {
+        return this.storage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param storage
+     *        Where channel data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Channel withStorage(ChannelStorage storage) {
+        setStorage(storage);
+        return this;
+    }
+
     /**
      * <p>
      * The ARN of the channel.
@@ -339,6 +385,8 @@ public String toString() {
         sb.append("{");
         if (getName() != null)
             sb.append("Name: ").append(getName()).append(",");
+        if (getStorage() != null)
+            sb.append("Storage: ").append(getStorage()).append(",");
         if (getArn() != null)
             sb.append("Arn: ").append(getArn()).append(",");
         if (getStatus() != null)
@@ -367,6 +415,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getName() != null && other.getName().equals(this.getName()) == false)
             return false;
+        if (other.getStorage() == null ^ this.getStorage() == null)
+            return false;
+        if (other.getStorage() != null && other.getStorage().equals(this.getStorage()) == false)
+            return false;
         if (other.getArn() == null ^ this.getArn() == null)
             return false;
         if (other.getArn() != null && other.getArn().equals(this.getArn()) == false)
@@ -396,6 +448,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getStorage() == null) ? 0 : getStorage().hashCode());
         hashCode = prime * hashCode + ((getArn() == null) ? 0 : getArn().hashCode());
         hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
         hashCode = prime * hashCode + ((getRetentionPeriod() == null) ? 0 : getRetentionPeriod().hashCode());
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelStorage.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelStorage.java
new file mode 100644
index 000000000000..4148a3bc5c15
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelStorage.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Where channel data is stored.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/ChannelStorage" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ChannelStorage implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     */
+    private ServiceManagedChannelS3Storage serviceManagedS3;
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket that you manage.
+     * </p>
+     */
+    private CustomerManagedChannelS3Storage customerManagedS3;
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public void setServiceManagedS3(ServiceManagedChannelS3Storage serviceManagedS3) {
+        this.serviceManagedS3 = serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @return Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public ServiceManagedChannelS3Storage getServiceManagedS3() {
+        return this.serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ChannelStorage withServiceManagedS3(ServiceManagedChannelS3Storage serviceManagedS3) {
+        setServiceManagedS3(serviceManagedS3);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Use this to store channel data in an S3 bucket that you manage.
+     */
+
+    public void setCustomerManagedS3(CustomerManagedChannelS3Storage customerManagedS3) {
+        this.customerManagedS3 = customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @return Use this to store channel data in an S3 bucket that you manage.
+     */
+
+    public CustomerManagedChannelS3Storage getCustomerManagedS3() {
+        return this.customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store channel data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Use this to store channel data in an S3 bucket that you manage.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ChannelStorage withCustomerManagedS3(CustomerManagedChannelS3Storage customerManagedS3) {
+        setCustomerManagedS3(customerManagedS3);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getServiceManagedS3() != null)
+            sb.append("ServiceManagedS3: ").append(getServiceManagedS3()).append(",");
+        if (getCustomerManagedS3() != null)
+            sb.append("CustomerManagedS3: ").append(getCustomerManagedS3());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ChannelStorage == false)
+            return false;
+        ChannelStorage other = (ChannelStorage) obj;
+        if (other.getServiceManagedS3() == null ^ this.getServiceManagedS3() == null)
+            return false;
+        if (other.getServiceManagedS3() != null && other.getServiceManagedS3().equals(this.getServiceManagedS3()) == false)
+            return false;
+        if (other.getCustomerManagedS3() == null ^ this.getCustomerManagedS3() == null)
+            return false;
+        if (other.getCustomerManagedS3() != null && other.getCustomerManagedS3().equals(this.getCustomerManagedS3()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getServiceManagedS3() == null) ? 0 : getServiceManagedS3().hashCode());
+        hashCode = prime * hashCode + ((getCustomerManagedS3() == null) ? 0 : getCustomerManagedS3().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ChannelStorage clone() {
+        try {
+            return (ChannelStorage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.ChannelStorageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelStorageSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelStorageSummary.java
new file mode 100644
index 000000000000..a11697a4c206
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelStorageSummary.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Where channel data is stored.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/ChannelStorageSummary" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ChannelStorageSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     */
+    private ServiceManagedChannelS3StorageSummary serviceManagedS3;
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket that you manage.
+     * </p>
+     */
+    private CustomerManagedChannelS3StorageSummary customerManagedS3;
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public void setServiceManagedS3(ServiceManagedChannelS3StorageSummary serviceManagedS3) {
+        this.serviceManagedS3 = serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @return Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public ServiceManagedChannelS3StorageSummary getServiceManagedS3() {
+        return this.serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ChannelStorageSummary withServiceManagedS3(ServiceManagedChannelS3StorageSummary serviceManagedS3) {
+        setServiceManagedS3(serviceManagedS3);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Used to store channel data in an S3 bucket that you manage.
+     */
+
+    public void setCustomerManagedS3(CustomerManagedChannelS3StorageSummary customerManagedS3) {
+        this.customerManagedS3 = customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @return Used to store channel data in an S3 bucket that you manage.
+     */
+
+    public CustomerManagedChannelS3StorageSummary getCustomerManagedS3() {
+        return this.customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store channel data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Used to store channel data in an S3 bucket that you manage.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ChannelStorageSummary withCustomerManagedS3(CustomerManagedChannelS3StorageSummary customerManagedS3) {
+        setCustomerManagedS3(customerManagedS3);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getServiceManagedS3() != null)
+            sb.append("ServiceManagedS3: ").append(getServiceManagedS3()).append(",");
+        if (getCustomerManagedS3() != null)
+            sb.append("CustomerManagedS3: ").append(getCustomerManagedS3());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ChannelStorageSummary == false)
+            return false;
+        ChannelStorageSummary other = (ChannelStorageSummary) obj;
+        if (other.getServiceManagedS3() == null ^ this.getServiceManagedS3() == null)
+            return false;
+        if (other.getServiceManagedS3() != null && other.getServiceManagedS3().equals(this.getServiceManagedS3()) == false)
+            return false;
+        if (other.getCustomerManagedS3() == null ^ this.getCustomerManagedS3() == null)
+            return false;
+        if (other.getCustomerManagedS3() != null && other.getCustomerManagedS3().equals(this.getCustomerManagedS3()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getServiceManagedS3() == null) ? 0 : getServiceManagedS3().hashCode());
+        hashCode = prime * hashCode + ((getCustomerManagedS3() == null) ? 0 : getCustomerManagedS3().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ChannelStorageSummary clone() {
+        try {
+            return (ChannelStorageSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.ChannelStorageSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelSummary.java
index 076803eaa4fc..66dcd9508e67 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelSummary.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ChannelSummary.java
@@ -34,6 +34,12 @@ public class ChannelSummary implements Serializable, Cloneable, StructuredPojo {
      * </p>
      */
     private String channelName;
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     */
+    private ChannelStorageSummary channelStorage;
     /**
      * <p>
      * The status of the channel.
@@ -93,6 +99,46 @@ public ChannelSummary withChannelName(String channelName) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param channelStorage
+     *        Where channel data is stored.
+     */
+
+    public void setChannelStorage(ChannelStorageSummary channelStorage) {
+        this.channelStorage = channelStorage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @return Where channel data is stored.
+     */
+
+    public ChannelStorageSummary getChannelStorage() {
+        return this.channelStorage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param channelStorage
+     *        Where channel data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ChannelSummary withChannelStorage(ChannelStorageSummary channelStorage) {
+        setChannelStorage(channelStorage);
+        return this;
+    }
+
     /**
      * <p>
      * The status of the channel.
@@ -246,6 +292,8 @@ public String toString() {
         sb.append("{");
         if (getChannelName() != null)
             sb.append("ChannelName: ").append(getChannelName()).append(",");
+        if (getChannelStorage() != null)
+            sb.append("ChannelStorage: ").append(getChannelStorage()).append(",");
         if (getStatus() != null)
             sb.append("Status: ").append(getStatus()).append(",");
         if (getCreationTime() != null)
@@ -270,6 +318,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getChannelName() != null && other.getChannelName().equals(this.getChannelName()) == false)
             return false;
+        if (other.getChannelStorage() == null ^ this.getChannelStorage() == null)
+            return false;
+        if (other.getChannelStorage() != null && other.getChannelStorage().equals(this.getChannelStorage()) == false)
+            return false;
         if (other.getStatus() == null ^ this.getStatus() == null)
             return false;
         if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
@@ -291,6 +343,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getChannelName() == null) ? 0 : getChannelName().hashCode());
+        hashCode = prime * hashCode + ((getChannelStorage() == null) ? 0 : getChannelStorage().hashCode());
         hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
         hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
         hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateChannelRequest.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateChannelRequest.java
index ffc7704f6041..d40eac7c69eb 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateChannelRequest.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateChannelRequest.java
@@ -31,6 +31,12 @@ public class CreateChannelRequest extends com.amazonaws.AmazonWebServiceRequest
      * </p>
      */
     private String channelName;
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     */
+    private ChannelStorage channelStorage;
     /**
      * <p>
      * How long, in days, message data is kept for the channel.
@@ -84,6 +90,46 @@ public CreateChannelRequest withChannelName(String channelName) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param channelStorage
+     *        Where channel data is stored.
+     */
+
+    public void setChannelStorage(ChannelStorage channelStorage) {
+        this.channelStorage = channelStorage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @return Where channel data is stored.
+     */
+
+    public ChannelStorage getChannelStorage() {
+        return this.channelStorage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param channelStorage
+     *        Where channel data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateChannelRequest withChannelStorage(ChannelStorage channelStorage) {
+        setChannelStorage(channelStorage);
+        return this;
+    }
+
     /**
      * <p>
      * How long, in days, message data is kept for the channel.
@@ -208,6 +254,8 @@ public String toString() {
         sb.append("{");
         if (getChannelName() != null)
             sb.append("ChannelName: ").append(getChannelName()).append(",");
+        if (getChannelStorage() != null)
+            sb.append("ChannelStorage: ").append(getChannelStorage()).append(",");
         if (getRetentionPeriod() != null)
             sb.append("RetentionPeriod: ").append(getRetentionPeriod()).append(",");
         if (getTags() != null)
@@ -230,6 +278,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getChannelName() != null && other.getChannelName().equals(this.getChannelName()) == false)
             return false;
+        if (other.getChannelStorage() == null ^ this.getChannelStorage() == null)
+            return false;
+        if (other.getChannelStorage() != null && other.getChannelStorage().equals(this.getChannelStorage()) == false)
+            return false;
         if (other.getRetentionPeriod() == null ^ this.getRetentionPeriod() == null)
             return false;
         if (other.getRetentionPeriod() != null && other.getRetentionPeriod().equals(this.getRetentionPeriod()) == false)
@@ -247,6 +299,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getChannelName() == null) ? 0 : getChannelName().hashCode());
+        hashCode = prime * hashCode + ((getChannelStorage() == null) ? 0 : getChannelStorage().hashCode());
         hashCode = prime * hashCode + ((getRetentionPeriod() == null) ? 0 : getRetentionPeriod().hashCode());
         hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
         return hashCode;
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateDatastoreRequest.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateDatastoreRequest.java
index 831e37807495..c8fa2a436ffb 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateDatastoreRequest.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CreateDatastoreRequest.java
@@ -31,6 +31,12 @@ public class CreateDatastoreRequest extends com.amazonaws.AmazonWebServiceReques
      * </p>
      */
     private String datastoreName;
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     */
+    private DatastoreStorage datastoreStorage;
     /**
      * <p>
      * How long, in days, message data is kept for the data store.
@@ -84,6 +90,46 @@ public CreateDatastoreRequest withDatastoreName(String datastoreName) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param datastoreStorage
+     *        Where data store data is stored.
+     */
+
+    public void setDatastoreStorage(DatastoreStorage datastoreStorage) {
+        this.datastoreStorage = datastoreStorage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @return Where data store data is stored.
+     */
+
+    public DatastoreStorage getDatastoreStorage() {
+        return this.datastoreStorage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param datastoreStorage
+     *        Where data store data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDatastoreRequest withDatastoreStorage(DatastoreStorage datastoreStorage) {
+        setDatastoreStorage(datastoreStorage);
+        return this;
+    }
+
     /**
      * <p>
      * How long, in days, message data is kept for the data store.
@@ -208,6 +254,8 @@ public String toString() {
         sb.append("{");
         if (getDatastoreName() != null)
             sb.append("DatastoreName: ").append(getDatastoreName()).append(",");
+        if (getDatastoreStorage() != null)
+            sb.append("DatastoreStorage: ").append(getDatastoreStorage()).append(",");
         if (getRetentionPeriod() != null)
             sb.append("RetentionPeriod: ").append(getRetentionPeriod()).append(",");
         if (getTags() != null)
@@ -230,6 +278,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getDatastoreName() != null && other.getDatastoreName().equals(this.getDatastoreName()) == false)
             return false;
+        if (other.getDatastoreStorage() == null ^ this.getDatastoreStorage() == null)
+            return false;
+        if (other.getDatastoreStorage() != null && other.getDatastoreStorage().equals(this.getDatastoreStorage()) == false)
+            return false;
         if (other.getRetentionPeriod() == null ^ this.getRetentionPeriod() == null)
             return false;
         if (other.getRetentionPeriod() != null && other.getRetentionPeriod().equals(this.getRetentionPeriod()) == false)
@@ -247,6 +299,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getDatastoreName() == null) ? 0 : getDatastoreName().hashCode());
+        hashCode = prime * hashCode + ((getDatastoreStorage() == null) ? 0 : getDatastoreStorage().hashCode());
         hashCode = prime * hashCode + ((getRetentionPeriod() == null) ? 0 : getRetentionPeriod().hashCode());
         hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
         return hashCode;
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedChannelS3Storage.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedChannelS3Storage.java
new file mode 100644
index 000000000000..93b6ae0ed725
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedChannelS3Storage.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Use this to store channel data in an S3 bucket that you manage.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/CustomerManagedChannelS3Storage"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedChannelS3Storage implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     */
+    private String bucket;
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     */
+    private String keyPrefix;
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     */
+    private String roleArn;
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which channel data is stored.
+     */
+
+    public void setBucket(String bucket) {
+        this.bucket = bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     * 
+     * @return The name of the Amazon S3 bucket in which channel data is stored.
+     */
+
+    public String getBucket() {
+        return this.bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which channel data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedChannelS3Storage withBucket(String bucket) {
+        setBucket(bucket);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a
+     *        key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @return The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a
+     *         key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public String getKeyPrefix() {
+        return this.keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a
+     *        key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedChannelS3Storage withKeyPrefix(String keyPrefix) {
+        setKeyPrefix(keyPrefix);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedChannelS3Storage withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBucket() != null)
+            sb.append("Bucket: ").append(getBucket()).append(",");
+        if (getKeyPrefix() != null)
+            sb.append("KeyPrefix: ").append(getKeyPrefix()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CustomerManagedChannelS3Storage == false)
+            return false;
+        CustomerManagedChannelS3Storage other = (CustomerManagedChannelS3Storage) obj;
+        if (other.getBucket() == null ^ this.getBucket() == null)
+            return false;
+        if (other.getBucket() != null && other.getBucket().equals(this.getBucket()) == false)
+            return false;
+        if (other.getKeyPrefix() == null ^ this.getKeyPrefix() == null)
+            return false;
+        if (other.getKeyPrefix() != null && other.getKeyPrefix().equals(this.getKeyPrefix()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBucket() == null) ? 0 : getBucket().hashCode());
+        hashCode = prime * hashCode + ((getKeyPrefix() == null) ? 0 : getKeyPrefix().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CustomerManagedChannelS3Storage clone() {
+        try {
+            return (CustomerManagedChannelS3Storage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.CustomerManagedChannelS3StorageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedChannelS3StorageSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedChannelS3StorageSummary.java
new file mode 100644
index 000000000000..3049954ebeed
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedChannelS3StorageSummary.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Used to store channel data in an S3 bucket that you manage.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/CustomerManagedChannelS3StorageSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedChannelS3StorageSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     */
+    private String bucket;
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     */
+    private String keyPrefix;
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     */
+    private String roleArn;
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which channel data is stored.
+     */
+
+    public void setBucket(String bucket) {
+        this.bucket = bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     * 
+     * @return The name of the Amazon S3 bucket in which channel data is stored.
+     */
+
+    public String getBucket() {
+        return this.bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which channel data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which channel data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedChannelS3StorageSummary withBucket(String bucket) {
+        setBucket(bucket);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a
+     *        key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @return The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a
+     *         key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public String getKeyPrefix() {
+        return this.keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that
+     * is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a
+     *        key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedChannelS3StorageSummary withKeyPrefix(String keyPrefix) {
+        setKeyPrefix(keyPrefix);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedChannelS3StorageSummary withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBucket() != null)
+            sb.append("Bucket: ").append(getBucket()).append(",");
+        if (getKeyPrefix() != null)
+            sb.append("KeyPrefix: ").append(getKeyPrefix()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CustomerManagedChannelS3StorageSummary == false)
+            return false;
+        CustomerManagedChannelS3StorageSummary other = (CustomerManagedChannelS3StorageSummary) obj;
+        if (other.getBucket() == null ^ this.getBucket() == null)
+            return false;
+        if (other.getBucket() != null && other.getBucket().equals(this.getBucket()) == false)
+            return false;
+        if (other.getKeyPrefix() == null ^ this.getKeyPrefix() == null)
+            return false;
+        if (other.getKeyPrefix() != null && other.getKeyPrefix().equals(this.getKeyPrefix()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBucket() == null) ? 0 : getBucket().hashCode());
+        hashCode = prime * hashCode + ((getKeyPrefix() == null) ? 0 : getKeyPrefix().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CustomerManagedChannelS3StorageSummary clone() {
+        try {
+            return (CustomerManagedChannelS3StorageSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.CustomerManagedChannelS3StorageSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedDatastoreS3Storage.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedDatastoreS3Storage.java
new file mode 100644
index 000000000000..eda47cf505ab
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedDatastoreS3Storage.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Use this to store data store data in an S3 bucket that you manage.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/CustomerManagedDatastoreS3Storage"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedDatastoreS3Storage implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     */
+    private String bucket;
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     */
+    private String keyPrefix;
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     */
+    private String roleArn;
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which data store data is stored.
+     */
+
+    public void setBucket(String bucket) {
+        this.bucket = bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     * 
+     * @return The name of the Amazon S3 bucket in which data store data is stored.
+     */
+
+    public String getBucket() {
+        return this.bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which data store data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedDatastoreS3Storage withBucket(String bucket) {
+        setBucket(bucket);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has
+     *        a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @return The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has
+     *         a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public String getKeyPrefix() {
+        return this.keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has
+     *        a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedDatastoreS3Storage withKeyPrefix(String keyPrefix) {
+        setKeyPrefix(keyPrefix);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedDatastoreS3Storage withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBucket() != null)
+            sb.append("Bucket: ").append(getBucket()).append(",");
+        if (getKeyPrefix() != null)
+            sb.append("KeyPrefix: ").append(getKeyPrefix()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CustomerManagedDatastoreS3Storage == false)
+            return false;
+        CustomerManagedDatastoreS3Storage other = (CustomerManagedDatastoreS3Storage) obj;
+        if (other.getBucket() == null ^ this.getBucket() == null)
+            return false;
+        if (other.getBucket() != null && other.getBucket().equals(this.getBucket()) == false)
+            return false;
+        if (other.getKeyPrefix() == null ^ this.getKeyPrefix() == null)
+            return false;
+        if (other.getKeyPrefix() != null && other.getKeyPrefix().equals(this.getKeyPrefix()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBucket() == null) ? 0 : getBucket().hashCode());
+        hashCode = prime * hashCode + ((getKeyPrefix() == null) ? 0 : getKeyPrefix().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CustomerManagedDatastoreS3Storage clone() {
+        try {
+            return (CustomerManagedDatastoreS3Storage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.CustomerManagedDatastoreS3StorageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedDatastoreS3StorageSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedDatastoreS3StorageSummary.java
new file mode 100644
index 000000000000..3bd21f4f11bf
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/CustomerManagedDatastoreS3StorageSummary.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Used to store data store data in an S3 bucket that you manage.
+ * </p>
+ * 
+ * @see <a
+ *      href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/CustomerManagedDatastoreS3StorageSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedDatastoreS3StorageSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     */
+    private String bucket;
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     */
+    private String keyPrefix;
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     */
+    private String roleArn;
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which data store data is stored.
+     */
+
+    public void setBucket(String bucket) {
+        this.bucket = bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     * 
+     * @return The name of the Amazon S3 bucket in which data store data is stored.
+     */
+
+    public String getBucket() {
+        return this.bucket;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon S3 bucket in which data store data is stored.
+     * </p>
+     * 
+     * @param bucket
+     *        The name of the Amazon S3 bucket in which data store data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedDatastoreS3StorageSummary withBucket(String bucket) {
+        setBucket(bucket);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has
+     *        a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @return The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has
+     *         a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     */
+
+    public String getKeyPrefix() {
+        return this.keyPrefix;
+    }
+
+    /**
+     * <p>
+     * The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key
+     * that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * </p>
+     * 
+     * @param keyPrefix
+     *        The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has
+     *        a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedDatastoreS3StorageSummary withKeyPrefix(String keyPrefix) {
+        setKeyPrefix(keyPrefix);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CustomerManagedDatastoreS3StorageSummary withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBucket() != null)
+            sb.append("Bucket: ").append(getBucket()).append(",");
+        if (getKeyPrefix() != null)
+            sb.append("KeyPrefix: ").append(getKeyPrefix()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CustomerManagedDatastoreS3StorageSummary == false)
+            return false;
+        CustomerManagedDatastoreS3StorageSummary other = (CustomerManagedDatastoreS3StorageSummary) obj;
+        if (other.getBucket() == null ^ this.getBucket() == null)
+            return false;
+        if (other.getBucket() != null && other.getBucket().equals(this.getBucket()) == false)
+            return false;
+        if (other.getKeyPrefix() == null ^ this.getKeyPrefix() == null)
+            return false;
+        if (other.getKeyPrefix() != null && other.getKeyPrefix().equals(this.getKeyPrefix()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBucket() == null) ? 0 : getBucket().hashCode());
+        hashCode = prime * hashCode + ((getKeyPrefix() == null) ? 0 : getKeyPrefix().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CustomerManagedDatastoreS3StorageSummary clone() {
+        try {
+            return (CustomerManagedDatastoreS3StorageSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.CustomerManagedDatastoreS3StorageSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Datastore.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Datastore.java
index d592e553a8e2..5cb63234611f 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Datastore.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/Datastore.java
@@ -34,6 +34,12 @@ public class Datastore implements Serializable, Cloneable, StructuredPojo {
      * </p>
      */
     private String name;
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     */
+    private DatastoreStorage storage;
     /**
      * <p>
      * The ARN of the data store.
@@ -125,6 +131,46 @@ public Datastore withName(String name) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param storage
+     *        Where data store data is stored.
+     */
+
+    public void setStorage(DatastoreStorage storage) {
+        this.storage = storage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @return Where data store data is stored.
+     */
+
+    public DatastoreStorage getStorage() {
+        return this.storage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param storage
+     *        Where data store data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Datastore withStorage(DatastoreStorage storage) {
+        setStorage(storage);
+        return this;
+    }
+
     /**
      * <p>
      * The ARN of the data store.
@@ -514,6 +560,8 @@ public String toString() {
         sb.append("{");
         if (getName() != null)
             sb.append("Name: ").append(getName()).append(",");
+        if (getStorage() != null)
+            sb.append("Storage: ").append(getStorage()).append(",");
         if (getArn() != null)
             sb.append("Arn: ").append(getArn()).append(",");
         if (getStatus() != null)
@@ -542,6 +590,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getName() != null && other.getName().equals(this.getName()) == false)
             return false;
+        if (other.getStorage() == null ^ this.getStorage() == null)
+            return false;
+        if (other.getStorage() != null && other.getStorage().equals(this.getStorage()) == false)
+            return false;
         if (other.getArn() == null ^ this.getArn() == null)
             return false;
         if (other.getArn() != null && other.getArn().equals(this.getArn()) == false)
@@ -571,6 +623,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getStorage() == null) ? 0 : getStorage().hashCode());
         hashCode = prime * hashCode + ((getArn() == null) ? 0 : getArn().hashCode());
         hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
         hashCode = prime * hashCode + ((getRetentionPeriod() == null) ? 0 : getRetentionPeriod().hashCode());
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreStorage.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreStorage.java
new file mode 100644
index 000000000000..04cad7de6e8a
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreStorage.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Where data store data is stored.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/DatastoreStorage" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DatastoreStorage implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     */
+    private ServiceManagedDatastoreS3Storage serviceManagedS3;
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket that you manage.
+     * </p>
+     */
+    private CustomerManagedDatastoreS3Storage customerManagedS3;
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public void setServiceManagedS3(ServiceManagedDatastoreS3Storage serviceManagedS3) {
+        this.serviceManagedS3 = serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @return Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public ServiceManagedDatastoreS3Storage getServiceManagedS3() {
+        return this.serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DatastoreStorage withServiceManagedS3(ServiceManagedDatastoreS3Storage serviceManagedS3) {
+        setServiceManagedS3(serviceManagedS3);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Use this to store data store data in an S3 bucket that you manage.
+     */
+
+    public void setCustomerManagedS3(CustomerManagedDatastoreS3Storage customerManagedS3) {
+        this.customerManagedS3 = customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @return Use this to store data store data in an S3 bucket that you manage.
+     */
+
+    public CustomerManagedDatastoreS3Storage getCustomerManagedS3() {
+        return this.customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Use this to store data store data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Use this to store data store data in an S3 bucket that you manage.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DatastoreStorage withCustomerManagedS3(CustomerManagedDatastoreS3Storage customerManagedS3) {
+        setCustomerManagedS3(customerManagedS3);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getServiceManagedS3() != null)
+            sb.append("ServiceManagedS3: ").append(getServiceManagedS3()).append(",");
+        if (getCustomerManagedS3() != null)
+            sb.append("CustomerManagedS3: ").append(getCustomerManagedS3());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DatastoreStorage == false)
+            return false;
+        DatastoreStorage other = (DatastoreStorage) obj;
+        if (other.getServiceManagedS3() == null ^ this.getServiceManagedS3() == null)
+            return false;
+        if (other.getServiceManagedS3() != null && other.getServiceManagedS3().equals(this.getServiceManagedS3()) == false)
+            return false;
+        if (other.getCustomerManagedS3() == null ^ this.getCustomerManagedS3() == null)
+            return false;
+        if (other.getCustomerManagedS3() != null && other.getCustomerManagedS3().equals(this.getCustomerManagedS3()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getServiceManagedS3() == null) ? 0 : getServiceManagedS3().hashCode());
+        hashCode = prime * hashCode + ((getCustomerManagedS3() == null) ? 0 : getCustomerManagedS3().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DatastoreStorage clone() {
+        try {
+            return (DatastoreStorage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.DatastoreStorageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreStorageSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreStorageSummary.java
new file mode 100644
index 000000000000..5e7d66724a95
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreStorageSummary.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Where data store data is stored.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/DatastoreStorageSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DatastoreStorageSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     */
+    private ServiceManagedDatastoreS3StorageSummary serviceManagedS3;
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket that you manage.
+     * </p>
+     */
+    private CustomerManagedDatastoreS3StorageSummary customerManagedS3;
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public void setServiceManagedS3(ServiceManagedDatastoreS3StorageSummary serviceManagedS3) {
+        this.serviceManagedS3 = serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @return Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     */
+
+    public ServiceManagedDatastoreS3StorageSummary getServiceManagedS3() {
+        return this.serviceManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * </p>
+     * 
+     * @param serviceManagedS3
+     *        Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DatastoreStorageSummary withServiceManagedS3(ServiceManagedDatastoreS3StorageSummary serviceManagedS3) {
+        setServiceManagedS3(serviceManagedS3);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Used to store data store data in an S3 bucket that you manage.
+     */
+
+    public void setCustomerManagedS3(CustomerManagedDatastoreS3StorageSummary customerManagedS3) {
+        this.customerManagedS3 = customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @return Used to store data store data in an S3 bucket that you manage.
+     */
+
+    public CustomerManagedDatastoreS3StorageSummary getCustomerManagedS3() {
+        return this.customerManagedS3;
+    }
+
+    /**
+     * <p>
+     * Used to store data store data in an S3 bucket that you manage.
+     * </p>
+     * 
+     * @param customerManagedS3
+     *        Used to store data store data in an S3 bucket that you manage.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DatastoreStorageSummary withCustomerManagedS3(CustomerManagedDatastoreS3StorageSummary customerManagedS3) {
+        setCustomerManagedS3(customerManagedS3);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getServiceManagedS3() != null)
+            sb.append("ServiceManagedS3: ").append(getServiceManagedS3()).append(",");
+        if (getCustomerManagedS3() != null)
+            sb.append("CustomerManagedS3: ").append(getCustomerManagedS3());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DatastoreStorageSummary == false)
+            return false;
+        DatastoreStorageSummary other = (DatastoreStorageSummary) obj;
+        if (other.getServiceManagedS3() == null ^ this.getServiceManagedS3() == null)
+            return false;
+        if (other.getServiceManagedS3() != null && other.getServiceManagedS3().equals(this.getServiceManagedS3()) == false)
+            return false;
+        if (other.getCustomerManagedS3() == null ^ this.getCustomerManagedS3() == null)
+            return false;
+        if (other.getCustomerManagedS3() != null && other.getCustomerManagedS3().equals(this.getCustomerManagedS3()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getServiceManagedS3() == null) ? 0 : getServiceManagedS3().hashCode());
+        hashCode = prime * hashCode + ((getCustomerManagedS3() == null) ? 0 : getCustomerManagedS3().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DatastoreStorageSummary clone() {
+        try {
+            return (DatastoreStorageSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.DatastoreStorageSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreSummary.java
index 81521f4dcc2c..679fbd23beb8 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreSummary.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/DatastoreSummary.java
@@ -34,6 +34,12 @@ public class DatastoreSummary implements Serializable, Cloneable, StructuredPojo
      * </p>
      */
     private String datastoreName;
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     */
+    private DatastoreStorageSummary datastoreStorage;
     /**
      * <p>
      * The status of the data store.
@@ -93,6 +99,46 @@ public DatastoreSummary withDatastoreName(String datastoreName) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param datastoreStorage
+     *        Where data store data is stored.
+     */
+
+    public void setDatastoreStorage(DatastoreStorageSummary datastoreStorage) {
+        this.datastoreStorage = datastoreStorage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @return Where data store data is stored.
+     */
+
+    public DatastoreStorageSummary getDatastoreStorage() {
+        return this.datastoreStorage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param datastoreStorage
+     *        Where data store data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DatastoreSummary withDatastoreStorage(DatastoreStorageSummary datastoreStorage) {
+        setDatastoreStorage(datastoreStorage);
+        return this;
+    }
+
     /**
      * <p>
      * The status of the data store.
@@ -246,6 +292,8 @@ public String toString() {
         sb.append("{");
         if (getDatastoreName() != null)
             sb.append("DatastoreName: ").append(getDatastoreName()).append(",");
+        if (getDatastoreStorage() != null)
+            sb.append("DatastoreStorage: ").append(getDatastoreStorage()).append(",");
         if (getStatus() != null)
             sb.append("Status: ").append(getStatus()).append(",");
         if (getCreationTime() != null)
@@ -270,6 +318,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getDatastoreName() != null && other.getDatastoreName().equals(this.getDatastoreName()) == false)
             return false;
+        if (other.getDatastoreStorage() == null ^ this.getDatastoreStorage() == null)
+            return false;
+        if (other.getDatastoreStorage() != null && other.getDatastoreStorage().equals(this.getDatastoreStorage()) == false)
+            return false;
         if (other.getStatus() == null ^ this.getStatus() == null)
             return false;
         if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
@@ -291,6 +343,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getDatastoreName() == null) ? 0 : getDatastoreName().hashCode());
+        hashCode = prime * hashCode + ((getDatastoreStorage() == null) ? 0 : getDatastoreStorage().hashCode());
         hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
         hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
         hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedChannelS3Storage.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedChannelS3Storage.java
new file mode 100644
index 000000000000..9cd53d5b9c51
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedChannelS3Storage.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/ServiceManagedChannelS3Storage"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedChannelS3Storage implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ServiceManagedChannelS3Storage == false)
+            return false;
+        ServiceManagedChannelS3Storage other = (ServiceManagedChannelS3Storage) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public ServiceManagedChannelS3Storage clone() {
+        try {
+            return (ServiceManagedChannelS3Storage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.ServiceManagedChannelS3StorageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedChannelS3StorageSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedChannelS3StorageSummary.java
new file mode 100644
index 000000000000..ff226d0eae1f
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedChannelS3StorageSummary.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/ServiceManagedChannelS3StorageSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedChannelS3StorageSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ServiceManagedChannelS3StorageSummary == false)
+            return false;
+        ServiceManagedChannelS3StorageSummary other = (ServiceManagedChannelS3StorageSummary) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public ServiceManagedChannelS3StorageSummary clone() {
+        try {
+            return (ServiceManagedChannelS3StorageSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.ServiceManagedChannelS3StorageSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedDatastoreS3Storage.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedDatastoreS3Storage.java
new file mode 100644
index 000000000000..8d2e49b52cb2
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedDatastoreS3Storage.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/ServiceManagedDatastoreS3Storage"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedDatastoreS3Storage implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ServiceManagedDatastoreS3Storage == false)
+            return false;
+        ServiceManagedDatastoreS3Storage other = (ServiceManagedDatastoreS3Storage) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public ServiceManagedDatastoreS3Storage clone() {
+        try {
+            return (ServiceManagedDatastoreS3Storage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.ServiceManagedDatastoreS3StorageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedDatastoreS3StorageSummary.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedDatastoreS3StorageSummary.java
new file mode 100644
index 000000000000..71b4451c44f8
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/ServiceManagedDatastoreS3StorageSummary.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotanalytics-2017-11-27/ServiceManagedDatastoreS3StorageSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedDatastoreS3StorageSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ServiceManagedDatastoreS3StorageSummary == false)
+            return false;
+        ServiceManagedDatastoreS3StorageSummary other = (ServiceManagedDatastoreS3StorageSummary) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public ServiceManagedDatastoreS3StorageSummary clone() {
+        try {
+            return (ServiceManagedDatastoreS3StorageSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotanalytics.model.transform.ServiceManagedDatastoreS3StorageSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateChannelRequest.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateChannelRequest.java
index 07d6dad6ad15..93b9042109c3 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateChannelRequest.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateChannelRequest.java
@@ -31,6 +31,12 @@ public class UpdateChannelRequest extends com.amazonaws.AmazonWebServiceRequest
      * </p>
      */
     private String channelName;
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     */
+    private ChannelStorage channelStorage;
     /**
      * <p>
      * How long, in days, message data is kept for the channel.
@@ -78,6 +84,46 @@ public UpdateChannelRequest withChannelName(String channelName) {
         return this;
     }
 
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param channelStorage
+     *        Where channel data is stored.
+     */
+
+    public void setChannelStorage(ChannelStorage channelStorage) {
+        this.channelStorage = channelStorage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @return Where channel data is stored.
+     */
+
+    public ChannelStorage getChannelStorage() {
+        return this.channelStorage;
+    }
+
+    /**
+     * <p>
+     * Where channel data is stored.
+     * </p>
+     * 
+     * @param channelStorage
+     *        Where channel data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateChannelRequest withChannelStorage(ChannelStorage channelStorage) {
+        setChannelStorage(channelStorage);
+        return this;
+    }
+
     /**
      * <p>
      * How long, in days, message data is kept for the channel.
@@ -132,6 +178,8 @@ public String toString() {
         sb.append("{");
         if (getChannelName() != null)
             sb.append("ChannelName: ").append(getChannelName()).append(",");
+        if (getChannelStorage() != null)
+            sb.append("ChannelStorage: ").append(getChannelStorage()).append(",");
         if (getRetentionPeriod() != null)
             sb.append("RetentionPeriod: ").append(getRetentionPeriod());
         sb.append("}");
@@ -152,6 +200,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getChannelName() != null && other.getChannelName().equals(this.getChannelName()) == false)
             return false;
+        if (other.getChannelStorage() == null ^ this.getChannelStorage() == null)
+            return false;
+        if (other.getChannelStorage() != null && other.getChannelStorage().equals(this.getChannelStorage()) == false)
+            return false;
         if (other.getRetentionPeriod() == null ^ this.getRetentionPeriod() == null)
             return false;
         if (other.getRetentionPeriod() != null && other.getRetentionPeriod().equals(this.getRetentionPeriod()) == false)
@@ -165,6 +217,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getChannelName() == null) ? 0 : getChannelName().hashCode());
+        hashCode = prime * hashCode + ((getChannelStorage() == null) ? 0 : getChannelStorage().hashCode());
         hashCode = prime * hashCode + ((getRetentionPeriod() == null) ? 0 : getRetentionPeriod().hashCode());
         return hashCode;
     }
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateDatastoreRequest.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateDatastoreRequest.java
index 7c19477501e2..55bf2aa25afe 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateDatastoreRequest.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/UpdateDatastoreRequest.java
@@ -37,6 +37,12 @@ public class UpdateDatastoreRequest extends com.amazonaws.AmazonWebServiceReques
      * </p>
      */
     private RetentionPeriod retentionPeriod;
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     */
+    private DatastoreStorage datastoreStorage;
 
     /**
      * <p>
@@ -118,6 +124,46 @@ public UpdateDatastoreRequest withRetentionPeriod(RetentionPeriod retentionPerio
         return this;
     }
 
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param datastoreStorage
+     *        Where data store data is stored.
+     */
+
+    public void setDatastoreStorage(DatastoreStorage datastoreStorage) {
+        this.datastoreStorage = datastoreStorage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @return Where data store data is stored.
+     */
+
+    public DatastoreStorage getDatastoreStorage() {
+        return this.datastoreStorage;
+    }
+
+    /**
+     * <p>
+     * Where data store data is stored.
+     * </p>
+     * 
+     * @param datastoreStorage
+     *        Where data store data is stored.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDatastoreRequest withDatastoreStorage(DatastoreStorage datastoreStorage) {
+        setDatastoreStorage(datastoreStorage);
+        return this;
+    }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -133,7 +179,9 @@ public String toString() {
         if (getDatastoreName() != null)
             sb.append("DatastoreName: ").append(getDatastoreName()).append(",");
         if (getRetentionPeriod() != null)
-            sb.append("RetentionPeriod: ").append(getRetentionPeriod());
+            sb.append("RetentionPeriod: ").append(getRetentionPeriod()).append(",");
+        if (getDatastoreStorage() != null)
+            sb.append("DatastoreStorage: ").append(getDatastoreStorage());
         sb.append("}");
         return sb.toString();
     }
@@ -156,6 +204,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getRetentionPeriod() != null && other.getRetentionPeriod().equals(this.getRetentionPeriod()) == false)
             return false;
+        if (other.getDatastoreStorage() == null ^ this.getDatastoreStorage() == null)
+            return false;
+        if (other.getDatastoreStorage() != null && other.getDatastoreStorage().equals(this.getDatastoreStorage()) == false)
+            return false;
         return true;
     }
 
@@ -166,6 +218,7 @@ public int hashCode() {
 
         hashCode = prime * hashCode + ((getDatastoreName() == null) ? 0 : getDatastoreName().hashCode());
         hashCode = prime * hashCode + ((getRetentionPeriod() == null) ? 0 : getRetentionPeriod().hashCode());
+        hashCode = prime * hashCode + ((getDatastoreStorage() == null) ? 0 : getDatastoreStorage().hashCode());
         return hashCode;
     }
 
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelJsonUnmarshaller.java
index 6760133f179a..b5cce151822a 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelJsonUnmarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelJsonUnmarshaller.java
@@ -52,6 +52,10 @@ public Channel unmarshall(JsonUnmarshallerContext context) throws Exception {
                     context.nextToken();
                     channel.setName(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("storage", targetDepth)) {
+                    context.nextToken();
+                    channel.setStorage(ChannelStorageJsonUnmarshaller.getInstance().unmarshall(context));
+                }
                 if (context.testExpression("arn", targetDepth)) {
                     context.nextToken();
                     channel.setArn(context.getUnmarshaller(String.class).unmarshall(context));
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelMarshaller.java
index 9cbe4bd66fe4..3b5ba5387597 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelMarshaller.java
@@ -29,6 +29,8 @@ public class ChannelMarshaller {
 
     private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("name").build();
+    private static final MarshallingInfo<StructuredPojo> STORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("storage").build();
     private static final MarshallingInfo<String> ARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("arn").build();
     private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
@@ -57,6 +59,7 @@ public void marshall(Channel channel, ProtocolMarshaller protocolMarshaller) {
 
         try {
             protocolMarshaller.marshall(channel.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(channel.getStorage(), STORAGE_BINDING);
             protocolMarshaller.marshall(channel.getArn(), ARN_BINDING);
             protocolMarshaller.marshall(channel.getStatus(), STATUS_BINDING);
             protocolMarshaller.marshall(channel.getRetentionPeriod(), RETENTIONPERIOD_BINDING);
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageJsonUnmarshaller.java
new file mode 100644
index 000000000000..a236faaa78c2
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ChannelStorage JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ChannelStorageJsonUnmarshaller implements Unmarshaller<ChannelStorage, JsonUnmarshallerContext> {
+
+    public ChannelStorage unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ChannelStorage channelStorage = new ChannelStorage();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("serviceManagedS3", targetDepth)) {
+                    context.nextToken();
+                    channelStorage.setServiceManagedS3(ServiceManagedChannelS3StorageJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("customerManagedS3", targetDepth)) {
+                    context.nextToken();
+                    channelStorage.setCustomerManagedS3(CustomerManagedChannelS3StorageJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return channelStorage;
+    }
+
+    private static ChannelStorageJsonUnmarshaller instance;
+
+    public static ChannelStorageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ChannelStorageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageMarshaller.java
new file mode 100644
index 000000000000..9bced68c409e
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ChannelStorageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ChannelStorageMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> SERVICEMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("serviceManagedS3").build();
+    private static final MarshallingInfo<StructuredPojo> CUSTOMERMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("customerManagedS3").build();
+
+    private static final ChannelStorageMarshaller instance = new ChannelStorageMarshaller();
+
+    public static ChannelStorageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ChannelStorage channelStorage, ProtocolMarshaller protocolMarshaller) {
+
+        if (channelStorage == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(channelStorage.getServiceManagedS3(), SERVICEMANAGEDS3_BINDING);
+            protocolMarshaller.marshall(channelStorage.getCustomerManagedS3(), CUSTOMERMANAGEDS3_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..eebd121dc924
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageSummaryJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ChannelStorageSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ChannelStorageSummaryJsonUnmarshaller implements Unmarshaller<ChannelStorageSummary, JsonUnmarshallerContext> {
+
+    public ChannelStorageSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ChannelStorageSummary channelStorageSummary = new ChannelStorageSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("serviceManagedS3", targetDepth)) {
+                    context.nextToken();
+                    channelStorageSummary.setServiceManagedS3(ServiceManagedChannelS3StorageSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("customerManagedS3", targetDepth)) {
+                    context.nextToken();
+                    channelStorageSummary.setCustomerManagedS3(CustomerManagedChannelS3StorageSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return channelStorageSummary;
+    }
+
+    private static ChannelStorageSummaryJsonUnmarshaller instance;
+
+    public static ChannelStorageSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ChannelStorageSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageSummaryMarshaller.java
new file mode 100644
index 000000000000..39011070cfbd
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelStorageSummaryMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ChannelStorageSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ChannelStorageSummaryMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> SERVICEMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("serviceManagedS3").build();
+    private static final MarshallingInfo<StructuredPojo> CUSTOMERMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("customerManagedS3").build();
+
+    private static final ChannelStorageSummaryMarshaller instance = new ChannelStorageSummaryMarshaller();
+
+    public static ChannelStorageSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ChannelStorageSummary channelStorageSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (channelStorageSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(channelStorageSummary.getServiceManagedS3(), SERVICEMANAGEDS3_BINDING);
+            protocolMarshaller.marshall(channelStorageSummary.getCustomerManagedS3(), CUSTOMERMANAGEDS3_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryJsonUnmarshaller.java
index 68dfbe4356da..bcb21a11ad11 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryJsonUnmarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryJsonUnmarshaller.java
@@ -52,6 +52,10 @@ public ChannelSummary unmarshall(JsonUnmarshallerContext context) throws Excepti
                     context.nextToken();
                     channelSummary.setChannelName(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("channelStorage", targetDepth)) {
+                    context.nextToken();
+                    channelSummary.setChannelStorage(ChannelStorageSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
                 if (context.testExpression("status", targetDepth)) {
                     context.nextToken();
                     channelSummary.setStatus(context.getUnmarshaller(String.class).unmarshall(context));
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryMarshaller.java
index 7ab57c3ac05e..3325099b073b 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ChannelSummaryMarshaller.java
@@ -29,6 +29,8 @@ public class ChannelSummaryMarshaller {
 
     private static final MarshallingInfo<String> CHANNELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("channelName").build();
+    private static final MarshallingInfo<StructuredPojo> CHANNELSTORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("channelStorage").build();
     private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("status").build();
     private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
@@ -53,6 +55,7 @@ public void marshall(ChannelSummary channelSummary, ProtocolMarshaller protocolM
 
         try {
             protocolMarshaller.marshall(channelSummary.getChannelName(), CHANNELNAME_BINDING);
+            protocolMarshaller.marshall(channelSummary.getChannelStorage(), CHANNELSTORAGE_BINDING);
             protocolMarshaller.marshall(channelSummary.getStatus(), STATUS_BINDING);
             protocolMarshaller.marshall(channelSummary.getCreationTime(), CREATIONTIME_BINDING);
             protocolMarshaller.marshall(channelSummary.getLastUpdateTime(), LASTUPDATETIME_BINDING);
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateChannelRequestMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateChannelRequestMarshaller.java
index afca59a8321e..9a6c7522a017 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateChannelRequestMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateChannelRequestMarshaller.java
@@ -30,6 +30,8 @@ public class CreateChannelRequestMarshaller {
 
     private static final MarshallingInfo<String> CHANNELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("channelName").build();
+    private static final MarshallingInfo<StructuredPojo> CHANNELSTORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("channelStorage").build();
     private static final MarshallingInfo<StructuredPojo> RETENTIONPERIOD_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("retentionPeriod").build();
     private static final MarshallingInfo<List> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
@@ -52,6 +54,7 @@ public void marshall(CreateChannelRequest createChannelRequest, ProtocolMarshall
 
         try {
             protocolMarshaller.marshall(createChannelRequest.getChannelName(), CHANNELNAME_BINDING);
+            protocolMarshaller.marshall(createChannelRequest.getChannelStorage(), CHANNELSTORAGE_BINDING);
             protocolMarshaller.marshall(createChannelRequest.getRetentionPeriod(), RETENTIONPERIOD_BINDING);
             protocolMarshaller.marshall(createChannelRequest.getTags(), TAGS_BINDING);
         } catch (Exception e) {
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateDatastoreRequestMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateDatastoreRequestMarshaller.java
index a79b6b6f9efe..1e17bf124aa1 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateDatastoreRequestMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CreateDatastoreRequestMarshaller.java
@@ -30,6 +30,8 @@ public class CreateDatastoreRequestMarshaller {
 
     private static final MarshallingInfo<String> DATASTORENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("datastoreName").build();
+    private static final MarshallingInfo<StructuredPojo> DATASTORESTORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("datastoreStorage").build();
     private static final MarshallingInfo<StructuredPojo> RETENTIONPERIOD_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("retentionPeriod").build();
     private static final MarshallingInfo<List> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
@@ -52,6 +54,7 @@ public void marshall(CreateDatastoreRequest createDatastoreRequest, ProtocolMars
 
         try {
             protocolMarshaller.marshall(createDatastoreRequest.getDatastoreName(), DATASTORENAME_BINDING);
+            protocolMarshaller.marshall(createDatastoreRequest.getDatastoreStorage(), DATASTORESTORAGE_BINDING);
             protocolMarshaller.marshall(createDatastoreRequest.getRetentionPeriod(), RETENTIONPERIOD_BINDING);
             protocolMarshaller.marshall(createDatastoreRequest.getTags(), TAGS_BINDING);
         } catch (Exception e) {
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageJsonUnmarshaller.java
new file mode 100644
index 000000000000..7d303fbc2d0d
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CustomerManagedChannelS3Storage JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedChannelS3StorageJsonUnmarshaller implements Unmarshaller<CustomerManagedChannelS3Storage, JsonUnmarshallerContext> {
+
+    public CustomerManagedChannelS3Storage unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CustomerManagedChannelS3Storage customerManagedChannelS3Storage = new CustomerManagedChannelS3Storage();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("bucket", targetDepth)) {
+                    context.nextToken();
+                    customerManagedChannelS3Storage.setBucket(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyPrefix", targetDepth)) {
+                    context.nextToken();
+                    customerManagedChannelS3Storage.setKeyPrefix(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    customerManagedChannelS3Storage.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return customerManagedChannelS3Storage;
+    }
+
+    private static CustomerManagedChannelS3StorageJsonUnmarshaller instance;
+
+    public static CustomerManagedChannelS3StorageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CustomerManagedChannelS3StorageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageMarshaller.java
new file mode 100644
index 000000000000..07847915a50a
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CustomerManagedChannelS3StorageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CustomerManagedChannelS3StorageMarshaller {
+
+    private static final MarshallingInfo<String> BUCKET_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("bucket").build();
+    private static final MarshallingInfo<String> KEYPREFIX_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyPrefix").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+
+    private static final CustomerManagedChannelS3StorageMarshaller instance = new CustomerManagedChannelS3StorageMarshaller();
+
+    public static CustomerManagedChannelS3StorageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CustomerManagedChannelS3Storage customerManagedChannelS3Storage, ProtocolMarshaller protocolMarshaller) {
+
+        if (customerManagedChannelS3Storage == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(customerManagedChannelS3Storage.getBucket(), BUCKET_BINDING);
+            protocolMarshaller.marshall(customerManagedChannelS3Storage.getKeyPrefix(), KEYPREFIX_BINDING);
+            protocolMarshaller.marshall(customerManagedChannelS3Storage.getRoleArn(), ROLEARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..0b0123c2f514
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageSummaryJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CustomerManagedChannelS3StorageSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedChannelS3StorageSummaryJsonUnmarshaller implements Unmarshaller<CustomerManagedChannelS3StorageSummary, JsonUnmarshallerContext> {
+
+    public CustomerManagedChannelS3StorageSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CustomerManagedChannelS3StorageSummary customerManagedChannelS3StorageSummary = new CustomerManagedChannelS3StorageSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("bucket", targetDepth)) {
+                    context.nextToken();
+                    customerManagedChannelS3StorageSummary.setBucket(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyPrefix", targetDepth)) {
+                    context.nextToken();
+                    customerManagedChannelS3StorageSummary.setKeyPrefix(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    customerManagedChannelS3StorageSummary.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return customerManagedChannelS3StorageSummary;
+    }
+
+    private static CustomerManagedChannelS3StorageSummaryJsonUnmarshaller instance;
+
+    public static CustomerManagedChannelS3StorageSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CustomerManagedChannelS3StorageSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageSummaryMarshaller.java
new file mode 100644
index 000000000000..7af5f09dfe4e
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedChannelS3StorageSummaryMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CustomerManagedChannelS3StorageSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CustomerManagedChannelS3StorageSummaryMarshaller {
+
+    private static final MarshallingInfo<String> BUCKET_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("bucket").build();
+    private static final MarshallingInfo<String> KEYPREFIX_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyPrefix").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+
+    private static final CustomerManagedChannelS3StorageSummaryMarshaller instance = new CustomerManagedChannelS3StorageSummaryMarshaller();
+
+    public static CustomerManagedChannelS3StorageSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CustomerManagedChannelS3StorageSummary customerManagedChannelS3StorageSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (customerManagedChannelS3StorageSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(customerManagedChannelS3StorageSummary.getBucket(), BUCKET_BINDING);
+            protocolMarshaller.marshall(customerManagedChannelS3StorageSummary.getKeyPrefix(), KEYPREFIX_BINDING);
+            protocolMarshaller.marshall(customerManagedChannelS3StorageSummary.getRoleArn(), ROLEARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageJsonUnmarshaller.java
new file mode 100644
index 000000000000..dea175312d70
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CustomerManagedDatastoreS3Storage JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedDatastoreS3StorageJsonUnmarshaller implements Unmarshaller<CustomerManagedDatastoreS3Storage, JsonUnmarshallerContext> {
+
+    public CustomerManagedDatastoreS3Storage unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CustomerManagedDatastoreS3Storage customerManagedDatastoreS3Storage = new CustomerManagedDatastoreS3Storage();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("bucket", targetDepth)) {
+                    context.nextToken();
+                    customerManagedDatastoreS3Storage.setBucket(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyPrefix", targetDepth)) {
+                    context.nextToken();
+                    customerManagedDatastoreS3Storage.setKeyPrefix(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    customerManagedDatastoreS3Storage.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return customerManagedDatastoreS3Storage;
+    }
+
+    private static CustomerManagedDatastoreS3StorageJsonUnmarshaller instance;
+
+    public static CustomerManagedDatastoreS3StorageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CustomerManagedDatastoreS3StorageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageMarshaller.java
new file mode 100644
index 000000000000..a7644b00e09e
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CustomerManagedDatastoreS3StorageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CustomerManagedDatastoreS3StorageMarshaller {
+
+    private static final MarshallingInfo<String> BUCKET_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("bucket").build();
+    private static final MarshallingInfo<String> KEYPREFIX_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyPrefix").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+
+    private static final CustomerManagedDatastoreS3StorageMarshaller instance = new CustomerManagedDatastoreS3StorageMarshaller();
+
+    public static CustomerManagedDatastoreS3StorageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CustomerManagedDatastoreS3Storage customerManagedDatastoreS3Storage, ProtocolMarshaller protocolMarshaller) {
+
+        if (customerManagedDatastoreS3Storage == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(customerManagedDatastoreS3Storage.getBucket(), BUCKET_BINDING);
+            protocolMarshaller.marshall(customerManagedDatastoreS3Storage.getKeyPrefix(), KEYPREFIX_BINDING);
+            protocolMarshaller.marshall(customerManagedDatastoreS3Storage.getRoleArn(), ROLEARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..1bcf27a12a1a
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CustomerManagedDatastoreS3StorageSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller implements
+        Unmarshaller<CustomerManagedDatastoreS3StorageSummary, JsonUnmarshallerContext> {
+
+    public CustomerManagedDatastoreS3StorageSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CustomerManagedDatastoreS3StorageSummary customerManagedDatastoreS3StorageSummary = new CustomerManagedDatastoreS3StorageSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("bucket", targetDepth)) {
+                    context.nextToken();
+                    customerManagedDatastoreS3StorageSummary.setBucket(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyPrefix", targetDepth)) {
+                    context.nextToken();
+                    customerManagedDatastoreS3StorageSummary.setKeyPrefix(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    customerManagedDatastoreS3StorageSummary.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return customerManagedDatastoreS3StorageSummary;
+    }
+
+    private static CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller instance;
+
+    public static CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageSummaryMarshaller.java
new file mode 100644
index 000000000000..8e9879e4c315
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/CustomerManagedDatastoreS3StorageSummaryMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CustomerManagedDatastoreS3StorageSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CustomerManagedDatastoreS3StorageSummaryMarshaller {
+
+    private static final MarshallingInfo<String> BUCKET_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("bucket").build();
+    private static final MarshallingInfo<String> KEYPREFIX_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyPrefix").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+
+    private static final CustomerManagedDatastoreS3StorageSummaryMarshaller instance = new CustomerManagedDatastoreS3StorageSummaryMarshaller();
+
+    public static CustomerManagedDatastoreS3StorageSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CustomerManagedDatastoreS3StorageSummary customerManagedDatastoreS3StorageSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (customerManagedDatastoreS3StorageSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(customerManagedDatastoreS3StorageSummary.getBucket(), BUCKET_BINDING);
+            protocolMarshaller.marshall(customerManagedDatastoreS3StorageSummary.getKeyPrefix(), KEYPREFIX_BINDING);
+            protocolMarshaller.marshall(customerManagedDatastoreS3StorageSummary.getRoleArn(), ROLEARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreJsonUnmarshaller.java
index ea0ad4db2e6e..dc14ce798b66 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreJsonUnmarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreJsonUnmarshaller.java
@@ -52,6 +52,10 @@ public Datastore unmarshall(JsonUnmarshallerContext context) throws Exception {
                     context.nextToken();
                     datastore.setName(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("storage", targetDepth)) {
+                    context.nextToken();
+                    datastore.setStorage(DatastoreStorageJsonUnmarshaller.getInstance().unmarshall(context));
+                }
                 if (context.testExpression("arn", targetDepth)) {
                     context.nextToken();
                     datastore.setArn(context.getUnmarshaller(String.class).unmarshall(context));
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreMarshaller.java
index 6f7dc1a2428c..ba948bd05cff 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreMarshaller.java
@@ -29,6 +29,8 @@ public class DatastoreMarshaller {
 
     private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("name").build();
+    private static final MarshallingInfo<StructuredPojo> STORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("storage").build();
     private static final MarshallingInfo<String> ARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("arn").build();
     private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
@@ -57,6 +59,7 @@ public void marshall(Datastore datastore, ProtocolMarshaller protocolMarshaller)
 
         try {
             protocolMarshaller.marshall(datastore.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(datastore.getStorage(), STORAGE_BINDING);
             protocolMarshaller.marshall(datastore.getArn(), ARN_BINDING);
             protocolMarshaller.marshall(datastore.getStatus(), STATUS_BINDING);
             protocolMarshaller.marshall(datastore.getRetentionPeriod(), RETENTIONPERIOD_BINDING);
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageJsonUnmarshaller.java
new file mode 100644
index 000000000000..e6cf60d0960f
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DatastoreStorage JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DatastoreStorageJsonUnmarshaller implements Unmarshaller<DatastoreStorage, JsonUnmarshallerContext> {
+
+    public DatastoreStorage unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DatastoreStorage datastoreStorage = new DatastoreStorage();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("serviceManagedS3", targetDepth)) {
+                    context.nextToken();
+                    datastoreStorage.setServiceManagedS3(ServiceManagedDatastoreS3StorageJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("customerManagedS3", targetDepth)) {
+                    context.nextToken();
+                    datastoreStorage.setCustomerManagedS3(CustomerManagedDatastoreS3StorageJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return datastoreStorage;
+    }
+
+    private static DatastoreStorageJsonUnmarshaller instance;
+
+    public static DatastoreStorageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DatastoreStorageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageMarshaller.java
new file mode 100644
index 000000000000..c1f83b45e2fb
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DatastoreStorageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DatastoreStorageMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> SERVICEMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("serviceManagedS3").build();
+    private static final MarshallingInfo<StructuredPojo> CUSTOMERMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("customerManagedS3").build();
+
+    private static final DatastoreStorageMarshaller instance = new DatastoreStorageMarshaller();
+
+    public static DatastoreStorageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DatastoreStorage datastoreStorage, ProtocolMarshaller protocolMarshaller) {
+
+        if (datastoreStorage == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(datastoreStorage.getServiceManagedS3(), SERVICEMANAGEDS3_BINDING);
+            protocolMarshaller.marshall(datastoreStorage.getCustomerManagedS3(), CUSTOMERMANAGEDS3_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..a1ca56df5a76
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageSummaryJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DatastoreStorageSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DatastoreStorageSummaryJsonUnmarshaller implements Unmarshaller<DatastoreStorageSummary, JsonUnmarshallerContext> {
+
+    public DatastoreStorageSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DatastoreStorageSummary datastoreStorageSummary = new DatastoreStorageSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("serviceManagedS3", targetDepth)) {
+                    context.nextToken();
+                    datastoreStorageSummary.setServiceManagedS3(ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("customerManagedS3", targetDepth)) {
+                    context.nextToken();
+                    datastoreStorageSummary.setCustomerManagedS3(CustomerManagedDatastoreS3StorageSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return datastoreStorageSummary;
+    }
+
+    private static DatastoreStorageSummaryJsonUnmarshaller instance;
+
+    public static DatastoreStorageSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DatastoreStorageSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageSummaryMarshaller.java
new file mode 100644
index 000000000000..195efc9945f1
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreStorageSummaryMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DatastoreStorageSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DatastoreStorageSummaryMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> SERVICEMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("serviceManagedS3").build();
+    private static final MarshallingInfo<StructuredPojo> CUSTOMERMANAGEDS3_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("customerManagedS3").build();
+
+    private static final DatastoreStorageSummaryMarshaller instance = new DatastoreStorageSummaryMarshaller();
+
+    public static DatastoreStorageSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DatastoreStorageSummary datastoreStorageSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (datastoreStorageSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(datastoreStorageSummary.getServiceManagedS3(), SERVICEMANAGEDS3_BINDING);
+            protocolMarshaller.marshall(datastoreStorageSummary.getCustomerManagedS3(), CUSTOMERMANAGEDS3_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryJsonUnmarshaller.java
index 9a62a558b651..4f88f52730cc 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryJsonUnmarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryJsonUnmarshaller.java
@@ -52,6 +52,10 @@ public DatastoreSummary unmarshall(JsonUnmarshallerContext context) throws Excep
                     context.nextToken();
                     datastoreSummary.setDatastoreName(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("datastoreStorage", targetDepth)) {
+                    context.nextToken();
+                    datastoreSummary.setDatastoreStorage(DatastoreStorageSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
                 if (context.testExpression("status", targetDepth)) {
                     context.nextToken();
                     datastoreSummary.setStatus(context.getUnmarshaller(String.class).unmarshall(context));
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryMarshaller.java
index d789e616035f..1984aa9afd50 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/DatastoreSummaryMarshaller.java
@@ -29,6 +29,8 @@ public class DatastoreSummaryMarshaller {
 
     private static final MarshallingInfo<String> DATASTORENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("datastoreName").build();
+    private static final MarshallingInfo<StructuredPojo> DATASTORESTORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("datastoreStorage").build();
     private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("status").build();
     private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
@@ -53,6 +55,7 @@ public void marshall(DatastoreSummary datastoreSummary, ProtocolMarshaller proto
 
         try {
             protocolMarshaller.marshall(datastoreSummary.getDatastoreName(), DATASTORENAME_BINDING);
+            protocolMarshaller.marshall(datastoreSummary.getDatastoreStorage(), DATASTORESTORAGE_BINDING);
             protocolMarshaller.marshall(datastoreSummary.getStatus(), STATUS_BINDING);
             protocolMarshaller.marshall(datastoreSummary.getCreationTime(), CREATIONTIME_BINDING);
             protocolMarshaller.marshall(datastoreSummary.getLastUpdateTime(), LASTUPDATETIME_BINDING);
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageJsonUnmarshaller.java
new file mode 100644
index 000000000000..7fc687a1c7c9
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageJsonUnmarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ServiceManagedChannelS3Storage JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedChannelS3StorageJsonUnmarshaller implements Unmarshaller<ServiceManagedChannelS3Storage, JsonUnmarshallerContext> {
+
+    public ServiceManagedChannelS3Storage unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ServiceManagedChannelS3Storage serviceManagedChannelS3Storage = new ServiceManagedChannelS3Storage();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return serviceManagedChannelS3Storage;
+    }
+
+    private static ServiceManagedChannelS3StorageJsonUnmarshaller instance;
+
+    public static ServiceManagedChannelS3StorageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ServiceManagedChannelS3StorageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageMarshaller.java
new file mode 100644
index 000000000000..58dac3c5ac9e
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageMarshaller.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ServiceManagedChannelS3StorageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ServiceManagedChannelS3StorageMarshaller {
+
+    private static final ServiceManagedChannelS3StorageMarshaller instance = new ServiceManagedChannelS3StorageMarshaller();
+
+    public static ServiceManagedChannelS3StorageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ServiceManagedChannelS3Storage serviceManagedChannelS3Storage, ProtocolMarshaller protocolMarshaller) {
+
+        if (serviceManagedChannelS3Storage == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..f49ece23e44d
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageSummaryJsonUnmarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ServiceManagedChannelS3StorageSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedChannelS3StorageSummaryJsonUnmarshaller implements Unmarshaller<ServiceManagedChannelS3StorageSummary, JsonUnmarshallerContext> {
+
+    public ServiceManagedChannelS3StorageSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ServiceManagedChannelS3StorageSummary serviceManagedChannelS3StorageSummary = new ServiceManagedChannelS3StorageSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return serviceManagedChannelS3StorageSummary;
+    }
+
+    private static ServiceManagedChannelS3StorageSummaryJsonUnmarshaller instance;
+
+    public static ServiceManagedChannelS3StorageSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ServiceManagedChannelS3StorageSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageSummaryMarshaller.java
new file mode 100644
index 000000000000..9c7941299030
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedChannelS3StorageSummaryMarshaller.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ServiceManagedChannelS3StorageSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ServiceManagedChannelS3StorageSummaryMarshaller {
+
+    private static final ServiceManagedChannelS3StorageSummaryMarshaller instance = new ServiceManagedChannelS3StorageSummaryMarshaller();
+
+    public static ServiceManagedChannelS3StorageSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ServiceManagedChannelS3StorageSummary serviceManagedChannelS3StorageSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (serviceManagedChannelS3StorageSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageJsonUnmarshaller.java
new file mode 100644
index 000000000000..e8259bfb2f7f
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageJsonUnmarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ServiceManagedDatastoreS3Storage JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedDatastoreS3StorageJsonUnmarshaller implements Unmarshaller<ServiceManagedDatastoreS3Storage, JsonUnmarshallerContext> {
+
+    public ServiceManagedDatastoreS3Storage unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ServiceManagedDatastoreS3Storage serviceManagedDatastoreS3Storage = new ServiceManagedDatastoreS3Storage();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return serviceManagedDatastoreS3Storage;
+    }
+
+    private static ServiceManagedDatastoreS3StorageJsonUnmarshaller instance;
+
+    public static ServiceManagedDatastoreS3StorageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ServiceManagedDatastoreS3StorageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageMarshaller.java
new file mode 100644
index 000000000000..0d3d18500f0c
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageMarshaller.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ServiceManagedDatastoreS3StorageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ServiceManagedDatastoreS3StorageMarshaller {
+
+    private static final ServiceManagedDatastoreS3StorageMarshaller instance = new ServiceManagedDatastoreS3StorageMarshaller();
+
+    public static ServiceManagedDatastoreS3StorageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ServiceManagedDatastoreS3Storage serviceManagedDatastoreS3Storage, ProtocolMarshaller protocolMarshaller) {
+
+        if (serviceManagedDatastoreS3Storage == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..d7dcfb440d65
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotanalytics.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ServiceManagedDatastoreS3StorageSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller implements Unmarshaller<ServiceManagedDatastoreS3StorageSummary, JsonUnmarshallerContext> {
+
+    public ServiceManagedDatastoreS3StorageSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ServiceManagedDatastoreS3StorageSummary serviceManagedDatastoreS3StorageSummary = new ServiceManagedDatastoreS3StorageSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return serviceManagedDatastoreS3StorageSummary;
+    }
+
+    private static ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller instance;
+
+    public static ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ServiceManagedDatastoreS3StorageSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageSummaryMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageSummaryMarshaller.java
new file mode 100644
index 000000000000..83f53d0fe27d
--- /dev/null
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/ServiceManagedDatastoreS3StorageSummaryMarshaller.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014-2019 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.iotanalytics.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotanalytics.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ServiceManagedDatastoreS3StorageSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ServiceManagedDatastoreS3StorageSummaryMarshaller {
+
+    private static final ServiceManagedDatastoreS3StorageSummaryMarshaller instance = new ServiceManagedDatastoreS3StorageSummaryMarshaller();
+
+    public static ServiceManagedDatastoreS3StorageSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ServiceManagedDatastoreS3StorageSummary serviceManagedDatastoreS3StorageSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (serviceManagedDatastoreS3StorageSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateChannelRequestMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateChannelRequestMarshaller.java
index cc576b1493fa..939e4d9dd949 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateChannelRequestMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateChannelRequestMarshaller.java
@@ -29,6 +29,8 @@ public class UpdateChannelRequestMarshaller {
 
     private static final MarshallingInfo<String> CHANNELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
             .marshallLocationName("channelName").build();
+    private static final MarshallingInfo<StructuredPojo> CHANNELSTORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("channelStorage").build();
     private static final MarshallingInfo<StructuredPojo> RETENTIONPERIOD_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("retentionPeriod").build();
 
@@ -49,6 +51,7 @@ public void marshall(UpdateChannelRequest updateChannelRequest, ProtocolMarshall
 
         try {
             protocolMarshaller.marshall(updateChannelRequest.getChannelName(), CHANNELNAME_BINDING);
+            protocolMarshaller.marshall(updateChannelRequest.getChannelStorage(), CHANNELSTORAGE_BINDING);
             protocolMarshaller.marshall(updateChannelRequest.getRetentionPeriod(), RETENTIONPERIOD_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
diff --git a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateDatastoreRequestMarshaller.java b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateDatastoreRequestMarshaller.java
index 1fb115353d01..27d3793d77b9 100644
--- a/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateDatastoreRequestMarshaller.java
+++ b/aws-java-sdk-iotanalytics/src/main/java/com/amazonaws/services/iotanalytics/model/transform/UpdateDatastoreRequestMarshaller.java
@@ -31,6 +31,8 @@ public class UpdateDatastoreRequestMarshaller {
             .marshallLocation(MarshallLocation.PATH).marshallLocationName("datastoreName").build();
     private static final MarshallingInfo<StructuredPojo> RETENTIONPERIOD_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("retentionPeriod").build();
+    private static final MarshallingInfo<StructuredPojo> DATASTORESTORAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("datastoreStorage").build();
 
     private static final UpdateDatastoreRequestMarshaller instance = new UpdateDatastoreRequestMarshaller();
 
@@ -50,6 +52,7 @@ public void marshall(UpdateDatastoreRequest updateDatastoreRequest, ProtocolMars
         try {
             protocolMarshaller.marshall(updateDatastoreRequest.getDatastoreName(), DATASTORENAME_BINDING);
             protocolMarshaller.marshall(updateDatastoreRequest.getRetentionPeriod(), RETENTIONPERIOD_BINDING);
+            protocolMarshaller.marshall(updateDatastoreRequest.getDatastoreStorage(), DATASTORESTORAGE_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
         }
diff --git a/aws-java-sdk-iotevents/build.properties b/aws-java-sdk-iotevents/build.properties
new file mode 100644
index 000000000000..0ceaa2b36ba5
--- /dev/null
+++ b/aws-java-sdk-iotevents/build.properties
@@ -0,0 +1,10 @@
+source.. = src/main/java,\
+           src/main/resources
+output.. = bin/
+
+bin.includes = LICENSE.txt,\
+               NOTICE.txt,\
+               META-INF/,\
+               .
+
+jre.compilation.profile = JavaSE-1.6
\ No newline at end of file
diff --git a/aws-java-sdk-iotevents/pom.xml b/aws-java-sdk-iotevents/pom.xml
new file mode 100644
index 000000000000..f147919b6b82
--- /dev/null
+++ b/aws-java-sdk-iotevents/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.amazonaws</groupId>
+    <artifactId>aws-java-sdk-pom</artifactId>
+    <version>1.11.563</version>
+  </parent>
+  <groupId>com.amazonaws</groupId>
+  <artifactId>aws-java-sdk-iotevents</artifactId>
+  <name>AWS Java SDK for AWS IoT Events</name>
+  <description>The AWS Java SDK for AWS IoT Events module holds the client classes that are used for communicating with AWS IoT Events Service</description>
+  <url>https://aws.amazon.com/sdkforjava</url>
+
+  <!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
+  <dependencies>
+    <dependency>
+        <artifactId>aws-java-sdk-core</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>aws-java-sdk-test-utils</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <scope>test</scope>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>jmespath-java</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+    </dependency>
+</dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- This profile uses the JAPICMP plugin to generate a report of changes between the release version and the latest version -->
+  <!-- For more information on the plugin, see https://github.com/siom79/japicmp -->
+  <profiles>
+    <profile>
+      <id>versiondiff</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.siom79.japicmp</groupId>
+            <artifactId>japicmp-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>cmp</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <oldVersion>
+                <dependency>
+                  <groupId>com.amazonaws</groupId>
+                  <artifactId>aws-java-sdk-iotevents</artifactId>
+                  <version>RELEASE</version>
+                </dependency>
+              </oldVersion>
+              <newVersion>
+                <file>
+                  <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+                </file>
+              </newVersion>
+              <parameter>
+                <onlyModified>true</onlyModified>
+                <accessModifier>public</accessModifier>
+                <breakBuildOnModifications>false</breakBuildOnModifications>
+                <breakBuildOnBinaryIncompatibleModifications>false</breakBuildOnBinaryIncompatibleModifications>
+                <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+              </parameter>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEvents.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEvents.java
new file mode 100644
index 000000000000..d36a6cdbd29f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEvents.java
@@ -0,0 +1,458 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.*;
+import com.amazonaws.regions.*;
+
+import com.amazonaws.services.iotevents.model.*;
+
+/**
+ * Interface for accessing AWS IoT Events.
+ * <p>
+ * <b>Note:</b> Do not directly implement this interface, new methods are added to it regularly. Extend from
+ * {@link com.amazonaws.services.iotevents.AbstractAWSIoTEvents} instead.
+ * </p>
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public interface AWSIoTEvents {
+
+    /**
+     * The region metadata service name for computing region endpoints. You can use this value to retrieve metadata
+     * (such as supported regions) of the service.
+     *
+     * @see RegionUtils#getRegionsForService(String)
+     */
+    String ENDPOINT_PREFIX = "iotevents";
+
+    /**
+     * <p>
+     * Creates a detector model.
+     * </p>
+     * 
+     * @param createDetectorModelRequest
+     * @return Result of the CreateDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ResourceAlreadyExistsException
+     *         The resource already exists.
+     * @throws LimitExceededException
+     *         A limit was exceeded.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.CreateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    CreateDetectorModelResult createDetectorModel(CreateDetectorModelRequest createDetectorModelRequest);
+
+    /**
+     * <p>
+     * Creates an input.
+     * </p>
+     * 
+     * @param createInputRequest
+     * @return Result of the CreateInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ResourceAlreadyExistsException
+     *         The resource already exists.
+     * @sample AWSIoTEvents.CreateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    CreateInputResult createInput(CreateInputRequest createInputRequest);
+
+    /**
+     * <p>
+     * Deletes a detector model. Any active instances of the detector model are also deleted.
+     * </p>
+     * 
+     * @param deleteDetectorModelRequest
+     * @return Result of the DeleteDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.DeleteDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    DeleteDetectorModelResult deleteDetectorModel(DeleteDetectorModelRequest deleteDetectorModelRequest);
+
+    /**
+     * <p>
+     * Deletes an input.
+     * </p>
+     * 
+     * @param deleteInputRequest
+     * @return Result of the DeleteInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @sample AWSIoTEvents.DeleteInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    DeleteInputResult deleteInput(DeleteInputRequest deleteInputRequest);
+
+    /**
+     * <p>
+     * Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest
+     * version is returned.
+     * </p>
+     * 
+     * @param describeDetectorModelRequest
+     * @return Result of the DescribeDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.DescribeDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeDetectorModel"
+     *      target="_top">AWS API Documentation</a>
+     */
+    DescribeDetectorModelResult describeDetectorModel(DescribeDetectorModelRequest describeDetectorModelRequest);
+
+    /**
+     * <p>
+     * Describes an input.
+     * </p>
+     * 
+     * @param describeInputRequest
+     * @return Result of the DescribeInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.DescribeInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    DescribeInputResult describeInput(DescribeInputRequest describeInputRequest);
+
+    /**
+     * <p>
+     * Retrieves the current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param describeLoggingOptionsRequest
+     * @return Result of the DescribeLoggingOptions operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws UnsupportedOperationException
+     *         The requested operation is not supported.
+     * @sample AWSIoTEvents.DescribeLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeLoggingOptions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    DescribeLoggingOptionsResult describeLoggingOptions(DescribeLoggingOptionsRequest describeLoggingOptionsRequest);
+
+    /**
+     * <p>
+     * Lists all the versions of a detector model. Only the metadata associated with each detector model version is
+     * returned.
+     * </p>
+     * 
+     * @param listDetectorModelVersionsRequest
+     * @return Result of the ListDetectorModelVersions operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.ListDetectorModelVersions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModelVersions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    ListDetectorModelVersionsResult listDetectorModelVersions(ListDetectorModelVersionsRequest listDetectorModelVersionsRequest);
+
+    /**
+     * <p>
+     * Lists the detector models you have created. Only the metadata associated with each detector model is returned.
+     * </p>
+     * 
+     * @param listDetectorModelsRequest
+     * @return Result of the ListDetectorModels operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.ListDetectorModels
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModels" target="_top">AWS
+     *      API Documentation</a>
+     */
+    ListDetectorModelsResult listDetectorModels(ListDetectorModelsRequest listDetectorModelsRequest);
+
+    /**
+     * <p>
+     * Lists the inputs you have created.
+     * </p>
+     * 
+     * @param listInputsRequest
+     * @return Result of the ListInputs operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.ListInputs
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListInputs" target="_top">AWS API
+     *      Documentation</a>
+     */
+    ListInputsResult listInputs(ListInputsRequest listInputsRequest);
+
+    /**
+     * <p>
+     * Lists the tags (metadata) you have assigned to the resource.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @return Result of the ListTagsForResource operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @sample AWSIoTEvents.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    ListTagsForResourceResult listTagsForResource(ListTagsForResourceRequest listTagsForResourceRequest);
+
+    /**
+     * <p>
+     * Sets or updates the AWS IoT Events logging options.
+     * </p>
+     * <p>
+     * Note that if you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the
+     * change to take effect. Also, if you change the policy attached to the role you specified in the roleArn field
+     * (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.
+     * </p>
+     * 
+     * @param putLoggingOptionsRequest
+     * @return Result of the PutLoggingOptions operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws UnsupportedOperationException
+     *         The requested operation is not supported.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @sample AWSIoTEvents.PutLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/PutLoggingOptions" target="_top">AWS
+     *      API Documentation</a>
+     */
+    PutLoggingOptionsResult putLoggingOptions(PutLoggingOptionsRequest putLoggingOptionsRequest);
+
+    /**
+     * <p>
+     * Add to or modifies the tags of the given resource. Tags are metadata which can be used to manage a resource.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @return Result of the TagResource operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws LimitExceededException
+     *         A limit was exceeded.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @sample AWSIoTEvents.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    TagResourceResult tagResource(TagResourceRequest tagResourceRequest);
+
+    /**
+     * <p>
+     * Removes the given tags (metadata) from the resource.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @return Result of the UntagResource operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @sample AWSIoTEvents.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    UntagResourceResult untagResource(UntagResourceRequest untagResourceRequest);
+
+    /**
+     * <p>
+     * Updates a detector model. Detectors (instances) spawned by the previous version will be deleted and re-created as
+     * new inputs arrive.
+     * </p>
+     * 
+     * @param updateDetectorModelRequest
+     * @return Result of the UpdateDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.UpdateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    UpdateDetectorModelResult updateDetectorModel(UpdateDetectorModelRequest updateDetectorModelRequest);
+
+    /**
+     * <p>
+     * Updates an input.
+     * </p>
+     * 
+     * @param updateInputRequest
+     * @return Result of the UpdateInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @sample AWSIoTEvents.UpdateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    UpdateInputResult updateInput(UpdateInputRequest updateInputRequest);
+
+    /**
+     * Shuts down this client object, releasing any resources that might be held open. This is an optional method, and
+     * callers are not expected to call it, but can if they want to explicitly release any open resources. Once a client
+     * has been shutdown, it should not be used to make any more requests.
+     */
+    void shutdown();
+
+    /**
+     * Returns additional metadata for a previously executed successful request, typically used for debugging issues
+     * where a service isn't acting as expected. This data isn't considered part of the result data returned by an
+     * operation, so it's available through this separate, diagnostic interface.
+     * <p>
+     * Response metadata is only cached for a limited period of time, so if you need to access this extra diagnostic
+     * information for an executed request, you should use this method to retrieve it as soon as possible after
+     * executing a request.
+     *
+     * @param request
+     *        The originally executed request.
+     *
+     * @return The response metadata for the specified request, or null if none is available.
+     */
+    ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request);
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsync.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsync.java
new file mode 100644
index 000000000000..7902a1ab4680
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsync.java
@@ -0,0 +1,550 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+
+/**
+ * Interface for accessing AWS IoT Events asynchronously. Each asynchronous method will return a Java Future object
+ * representing the asynchronous operation; overloads which accept an {@code AsyncHandler} can be used to receive
+ * notification when an asynchronous operation completes.
+ * <p>
+ * <b>Note:</b> Do not directly implement this interface, new methods are added to it regularly. Extend from
+ * {@link com.amazonaws.services.iotevents.AbstractAWSIoTEventsAsync} instead.
+ * </p>
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public interface AWSIoTEventsAsync extends AWSIoTEvents {
+
+    /**
+     * <p>
+     * Creates a detector model.
+     * </p>
+     * 
+     * @param createDetectorModelRequest
+     * @return A Java Future containing the result of the CreateDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsync.CreateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<CreateDetectorModelResult> createDetectorModelAsync(CreateDetectorModelRequest createDetectorModelRequest);
+
+    /**
+     * <p>
+     * Creates a detector model.
+     * </p>
+     * 
+     * @param createDetectorModelRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the CreateDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.CreateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<CreateDetectorModelResult> createDetectorModelAsync(CreateDetectorModelRequest createDetectorModelRequest,
+            com.amazonaws.handlers.AsyncHandler<CreateDetectorModelRequest, CreateDetectorModelResult> asyncHandler);
+
+    /**
+     * <p>
+     * Creates an input.
+     * </p>
+     * 
+     * @param createInputRequest
+     * @return A Java Future containing the result of the CreateInput operation returned by the service.
+     * @sample AWSIoTEventsAsync.CreateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<CreateInputResult> createInputAsync(CreateInputRequest createInputRequest);
+
+    /**
+     * <p>
+     * Creates an input.
+     * </p>
+     * 
+     * @param createInputRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the CreateInput operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.CreateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<CreateInputResult> createInputAsync(CreateInputRequest createInputRequest,
+            com.amazonaws.handlers.AsyncHandler<CreateInputRequest, CreateInputResult> asyncHandler);
+
+    /**
+     * <p>
+     * Deletes a detector model. Any active instances of the detector model are also deleted.
+     * </p>
+     * 
+     * @param deleteDetectorModelRequest
+     * @return A Java Future containing the result of the DeleteDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsync.DeleteDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<DeleteDetectorModelResult> deleteDetectorModelAsync(DeleteDetectorModelRequest deleteDetectorModelRequest);
+
+    /**
+     * <p>
+     * Deletes a detector model. Any active instances of the detector model are also deleted.
+     * </p>
+     * 
+     * @param deleteDetectorModelRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DeleteDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.DeleteDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<DeleteDetectorModelResult> deleteDetectorModelAsync(DeleteDetectorModelRequest deleteDetectorModelRequest,
+            com.amazonaws.handlers.AsyncHandler<DeleteDetectorModelRequest, DeleteDetectorModelResult> asyncHandler);
+
+    /**
+     * <p>
+     * Deletes an input.
+     * </p>
+     * 
+     * @param deleteInputRequest
+     * @return A Java Future containing the result of the DeleteInput operation returned by the service.
+     * @sample AWSIoTEventsAsync.DeleteInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<DeleteInputResult> deleteInputAsync(DeleteInputRequest deleteInputRequest);
+
+    /**
+     * <p>
+     * Deletes an input.
+     * </p>
+     * 
+     * @param deleteInputRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DeleteInput operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.DeleteInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<DeleteInputResult> deleteInputAsync(DeleteInputRequest deleteInputRequest,
+            com.amazonaws.handlers.AsyncHandler<DeleteInputRequest, DeleteInputResult> asyncHandler);
+
+    /**
+     * <p>
+     * Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest
+     * version is returned.
+     * </p>
+     * 
+     * @param describeDetectorModelRequest
+     * @return A Java Future containing the result of the DescribeDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsync.DescribeDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeDetectorModel"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeDetectorModelResult> describeDetectorModelAsync(DescribeDetectorModelRequest describeDetectorModelRequest);
+
+    /**
+     * <p>
+     * Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest
+     * version is returned.
+     * </p>
+     * 
+     * @param describeDetectorModelRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DescribeDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.DescribeDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeDetectorModel"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeDetectorModelResult> describeDetectorModelAsync(DescribeDetectorModelRequest describeDetectorModelRequest,
+            com.amazonaws.handlers.AsyncHandler<DescribeDetectorModelRequest, DescribeDetectorModelResult> asyncHandler);
+
+    /**
+     * <p>
+     * Describes an input.
+     * </p>
+     * 
+     * @param describeInputRequest
+     * @return A Java Future containing the result of the DescribeInput operation returned by the service.
+     * @sample AWSIoTEventsAsync.DescribeInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeInputResult> describeInputAsync(DescribeInputRequest describeInputRequest);
+
+    /**
+     * <p>
+     * Describes an input.
+     * </p>
+     * 
+     * @param describeInputRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DescribeInput operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.DescribeInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeInputResult> describeInputAsync(DescribeInputRequest describeInputRequest,
+            com.amazonaws.handlers.AsyncHandler<DescribeInputRequest, DescribeInputResult> asyncHandler);
+
+    /**
+     * <p>
+     * Retrieves the current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param describeLoggingOptionsRequest
+     * @return A Java Future containing the result of the DescribeLoggingOptions operation returned by the service.
+     * @sample AWSIoTEventsAsync.DescribeLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeLoggingOptions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeLoggingOptionsResult> describeLoggingOptionsAsync(DescribeLoggingOptionsRequest describeLoggingOptionsRequest);
+
+    /**
+     * <p>
+     * Retrieves the current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param describeLoggingOptionsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DescribeLoggingOptions operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.DescribeLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeLoggingOptions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeLoggingOptionsResult> describeLoggingOptionsAsync(DescribeLoggingOptionsRequest describeLoggingOptionsRequest,
+            com.amazonaws.handlers.AsyncHandler<DescribeLoggingOptionsRequest, DescribeLoggingOptionsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Lists all the versions of a detector model. Only the metadata associated with each detector model version is
+     * returned.
+     * </p>
+     * 
+     * @param listDetectorModelVersionsRequest
+     * @return A Java Future containing the result of the ListDetectorModelVersions operation returned by the service.
+     * @sample AWSIoTEventsAsync.ListDetectorModelVersions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModelVersions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<ListDetectorModelVersionsResult> listDetectorModelVersionsAsync(
+            ListDetectorModelVersionsRequest listDetectorModelVersionsRequest);
+
+    /**
+     * <p>
+     * Lists all the versions of a detector model. Only the metadata associated with each detector model version is
+     * returned.
+     * </p>
+     * 
+     * @param listDetectorModelVersionsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListDetectorModelVersions operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.ListDetectorModelVersions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModelVersions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<ListDetectorModelVersionsResult> listDetectorModelVersionsAsync(
+            ListDetectorModelVersionsRequest listDetectorModelVersionsRequest,
+            com.amazonaws.handlers.AsyncHandler<ListDetectorModelVersionsRequest, ListDetectorModelVersionsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Lists the detector models you have created. Only the metadata associated with each detector model is returned.
+     * </p>
+     * 
+     * @param listDetectorModelsRequest
+     * @return A Java Future containing the result of the ListDetectorModels operation returned by the service.
+     * @sample AWSIoTEventsAsync.ListDetectorModels
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModels" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListDetectorModelsResult> listDetectorModelsAsync(ListDetectorModelsRequest listDetectorModelsRequest);
+
+    /**
+     * <p>
+     * Lists the detector models you have created. Only the metadata associated with each detector model is returned.
+     * </p>
+     * 
+     * @param listDetectorModelsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListDetectorModels operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.ListDetectorModels
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModels" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListDetectorModelsResult> listDetectorModelsAsync(ListDetectorModelsRequest listDetectorModelsRequest,
+            com.amazonaws.handlers.AsyncHandler<ListDetectorModelsRequest, ListDetectorModelsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Lists the inputs you have created.
+     * </p>
+     * 
+     * @param listInputsRequest
+     * @return A Java Future containing the result of the ListInputs operation returned by the service.
+     * @sample AWSIoTEventsAsync.ListInputs
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListInputs" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<ListInputsResult> listInputsAsync(ListInputsRequest listInputsRequest);
+
+    /**
+     * <p>
+     * Lists the inputs you have created.
+     * </p>
+     * 
+     * @param listInputsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListInputs operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.ListInputs
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListInputs" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<ListInputsResult> listInputsAsync(ListInputsRequest listInputsRequest,
+            com.amazonaws.handlers.AsyncHandler<ListInputsRequest, ListInputsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Lists the tags (metadata) you have assigned to the resource.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @return A Java Future containing the result of the ListTagsForResource operation returned by the service.
+     * @sample AWSIoTEventsAsync.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest listTagsForResourceRequest);
+
+    /**
+     * <p>
+     * Lists the tags (metadata) you have assigned to the resource.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListTagsForResource operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest listTagsForResourceRequest,
+            com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult> asyncHandler);
+
+    /**
+     * <p>
+     * Sets or updates the AWS IoT Events logging options.
+     * </p>
+     * <p>
+     * Note that if you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the
+     * change to take effect. Also, if you change the policy attached to the role you specified in the roleArn field
+     * (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.
+     * </p>
+     * 
+     * @param putLoggingOptionsRequest
+     * @return A Java Future containing the result of the PutLoggingOptions operation returned by the service.
+     * @sample AWSIoTEventsAsync.PutLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/PutLoggingOptions" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<PutLoggingOptionsResult> putLoggingOptionsAsync(PutLoggingOptionsRequest putLoggingOptionsRequest);
+
+    /**
+     * <p>
+     * Sets or updates the AWS IoT Events logging options.
+     * </p>
+     * <p>
+     * Note that if you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the
+     * change to take effect. Also, if you change the policy attached to the role you specified in the roleArn field
+     * (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.
+     * </p>
+     * 
+     * @param putLoggingOptionsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the PutLoggingOptions operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.PutLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/PutLoggingOptions" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<PutLoggingOptionsResult> putLoggingOptionsAsync(PutLoggingOptionsRequest putLoggingOptionsRequest,
+            com.amazonaws.handlers.AsyncHandler<PutLoggingOptionsRequest, PutLoggingOptionsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Add to or modifies the tags of the given resource. Tags are metadata which can be used to manage a resource.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @return A Java Future containing the result of the TagResource operation returned by the service.
+     * @sample AWSIoTEventsAsync.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest tagResourceRequest);
+
+    /**
+     * <p>
+     * Add to or modifies the tags of the given resource. Tags are metadata which can be used to manage a resource.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the TagResource operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest tagResourceRequest,
+            com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult> asyncHandler);
+
+    /**
+     * <p>
+     * Removes the given tags (metadata) from the resource.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @return A Java Future containing the result of the UntagResource operation returned by the service.
+     * @sample AWSIoTEventsAsync.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest untagResourceRequest);
+
+    /**
+     * <p>
+     * Removes the given tags (metadata) from the resource.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the UntagResource operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest untagResourceRequest,
+            com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler);
+
+    /**
+     * <p>
+     * Updates a detector model. Detectors (instances) spawned by the previous version will be deleted and re-created as
+     * new inputs arrive.
+     * </p>
+     * 
+     * @param updateDetectorModelRequest
+     * @return A Java Future containing the result of the UpdateDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsync.UpdateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateDetectorModelResult> updateDetectorModelAsync(UpdateDetectorModelRequest updateDetectorModelRequest);
+
+    /**
+     * <p>
+     * Updates a detector model. Detectors (instances) spawned by the previous version will be deleted and re-created as
+     * new inputs arrive.
+     * </p>
+     * 
+     * @param updateDetectorModelRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the UpdateDetectorModel operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.UpdateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateDetectorModelResult> updateDetectorModelAsync(UpdateDetectorModelRequest updateDetectorModelRequest,
+            com.amazonaws.handlers.AsyncHandler<UpdateDetectorModelRequest, UpdateDetectorModelResult> asyncHandler);
+
+    /**
+     * <p>
+     * Updates an input.
+     * </p>
+     * 
+     * @param updateInputRequest
+     * @return A Java Future containing the result of the UpdateInput operation returned by the service.
+     * @sample AWSIoTEventsAsync.UpdateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateInputResult> updateInputAsync(UpdateInputRequest updateInputRequest);
+
+    /**
+     * <p>
+     * Updates an input.
+     * </p>
+     * 
+     * @param updateInputRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the UpdateInput operation returned by the service.
+     * @sample AWSIoTEventsAsyncHandler.UpdateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateInputResult> updateInputAsync(UpdateInputRequest updateInputRequest,
+            com.amazonaws.handlers.AsyncHandler<UpdateInputRequest, UpdateInputResult> asyncHandler);
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsyncClient.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsyncClient.java
new file mode 100644
index 000000000000..c885e2444f59
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsyncClient.java
@@ -0,0 +1,604 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.client.AwsAsyncClientParams;
+import com.amazonaws.annotation.ThreadSafe;
+
+import java.util.concurrent.ExecutorService;
+
+/**
+ * Client for accessing AWS IoT Events asynchronously. Each asynchronous method will return a Java Future object
+ * representing the asynchronous operation; overloads which accept an {@code AsyncHandler} can be used to receive
+ * notification when an asynchronous operation completes.
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@ThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AWSIoTEventsAsyncClient extends AWSIoTEventsClient implements AWSIoTEventsAsync {
+
+    private static final int DEFAULT_THREAD_POOL_SIZE = 50;
+
+    private final java.util.concurrent.ExecutorService executorService;
+
+    public static AWSIoTEventsAsyncClientBuilder asyncBuilder() {
+        return AWSIoTEventsAsyncClientBuilder.standard();
+    }
+
+    /**
+     * Constructs a new asynchronous client to invoke service methods on AWS IoT Events using the specified parameters.
+     *
+     * @param asyncClientParams
+     *        Object providing client parameters.
+     */
+    AWSIoTEventsAsyncClient(AwsAsyncClientParams asyncClientParams) {
+        super(asyncClientParams);
+        this.executorService = asyncClientParams.getExecutor();
+    }
+
+    /**
+     * Returns the executor service used by this client to execute async requests.
+     *
+     * @return The executor service used by this client to execute async requests.
+     */
+    public ExecutorService getExecutorService() {
+        return executorService;
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateDetectorModelResult> createDetectorModelAsync(CreateDetectorModelRequest request) {
+
+        return createDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateDetectorModelResult> createDetectorModelAsync(final CreateDetectorModelRequest request,
+            final com.amazonaws.handlers.AsyncHandler<CreateDetectorModelRequest, CreateDetectorModelResult> asyncHandler) {
+        final CreateDetectorModelRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<CreateDetectorModelResult>() {
+            @Override
+            public CreateDetectorModelResult call() throws Exception {
+                CreateDetectorModelResult result = null;
+
+                try {
+                    result = executeCreateDetectorModel(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateInputResult> createInputAsync(CreateInputRequest request) {
+
+        return createInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateInputResult> createInputAsync(final CreateInputRequest request,
+            final com.amazonaws.handlers.AsyncHandler<CreateInputRequest, CreateInputResult> asyncHandler) {
+        final CreateInputRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<CreateInputResult>() {
+            @Override
+            public CreateInputResult call() throws Exception {
+                CreateInputResult result = null;
+
+                try {
+                    result = executeCreateInput(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteDetectorModelResult> deleteDetectorModelAsync(DeleteDetectorModelRequest request) {
+
+        return deleteDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteDetectorModelResult> deleteDetectorModelAsync(final DeleteDetectorModelRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DeleteDetectorModelRequest, DeleteDetectorModelResult> asyncHandler) {
+        final DeleteDetectorModelRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DeleteDetectorModelResult>() {
+            @Override
+            public DeleteDetectorModelResult call() throws Exception {
+                DeleteDetectorModelResult result = null;
+
+                try {
+                    result = executeDeleteDetectorModel(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteInputResult> deleteInputAsync(DeleteInputRequest request) {
+
+        return deleteInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteInputResult> deleteInputAsync(final DeleteInputRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DeleteInputRequest, DeleteInputResult> asyncHandler) {
+        final DeleteInputRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DeleteInputResult>() {
+            @Override
+            public DeleteInputResult call() throws Exception {
+                DeleteInputResult result = null;
+
+                try {
+                    result = executeDeleteInput(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorModelResult> describeDetectorModelAsync(DescribeDetectorModelRequest request) {
+
+        return describeDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorModelResult> describeDetectorModelAsync(final DescribeDetectorModelRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DescribeDetectorModelRequest, DescribeDetectorModelResult> asyncHandler) {
+        final DescribeDetectorModelRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DescribeDetectorModelResult>() {
+            @Override
+            public DescribeDetectorModelResult call() throws Exception {
+                DescribeDetectorModelResult result = null;
+
+                try {
+                    result = executeDescribeDetectorModel(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeInputResult> describeInputAsync(DescribeInputRequest request) {
+
+        return describeInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeInputResult> describeInputAsync(final DescribeInputRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DescribeInputRequest, DescribeInputResult> asyncHandler) {
+        final DescribeInputRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DescribeInputResult>() {
+            @Override
+            public DescribeInputResult call() throws Exception {
+                DescribeInputResult result = null;
+
+                try {
+                    result = executeDescribeInput(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeLoggingOptionsResult> describeLoggingOptionsAsync(DescribeLoggingOptionsRequest request) {
+
+        return describeLoggingOptionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeLoggingOptionsResult> describeLoggingOptionsAsync(final DescribeLoggingOptionsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DescribeLoggingOptionsRequest, DescribeLoggingOptionsResult> asyncHandler) {
+        final DescribeLoggingOptionsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DescribeLoggingOptionsResult>() {
+            @Override
+            public DescribeLoggingOptionsResult call() throws Exception {
+                DescribeLoggingOptionsResult result = null;
+
+                try {
+                    result = executeDescribeLoggingOptions(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelVersionsResult> listDetectorModelVersionsAsync(ListDetectorModelVersionsRequest request) {
+
+        return listDetectorModelVersionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelVersionsResult> listDetectorModelVersionsAsync(final ListDetectorModelVersionsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListDetectorModelVersionsRequest, ListDetectorModelVersionsResult> asyncHandler) {
+        final ListDetectorModelVersionsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListDetectorModelVersionsResult>() {
+            @Override
+            public ListDetectorModelVersionsResult call() throws Exception {
+                ListDetectorModelVersionsResult result = null;
+
+                try {
+                    result = executeListDetectorModelVersions(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelsResult> listDetectorModelsAsync(ListDetectorModelsRequest request) {
+
+        return listDetectorModelsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelsResult> listDetectorModelsAsync(final ListDetectorModelsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListDetectorModelsRequest, ListDetectorModelsResult> asyncHandler) {
+        final ListDetectorModelsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListDetectorModelsResult>() {
+            @Override
+            public ListDetectorModelsResult call() throws Exception {
+                ListDetectorModelsResult result = null;
+
+                try {
+                    result = executeListDetectorModels(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListInputsResult> listInputsAsync(ListInputsRequest request) {
+
+        return listInputsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListInputsResult> listInputsAsync(final ListInputsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListInputsRequest, ListInputsResult> asyncHandler) {
+        final ListInputsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListInputsResult>() {
+            @Override
+            public ListInputsResult call() throws Exception {
+                ListInputsResult result = null;
+
+                try {
+                    result = executeListInputs(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest request) {
+
+        return listTagsForResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(final ListTagsForResourceRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult> asyncHandler) {
+        final ListTagsForResourceRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListTagsForResourceResult>() {
+            @Override
+            public ListTagsForResourceResult call() throws Exception {
+                ListTagsForResourceResult result = null;
+
+                try {
+                    result = executeListTagsForResource(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<PutLoggingOptionsResult> putLoggingOptionsAsync(PutLoggingOptionsRequest request) {
+
+        return putLoggingOptionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<PutLoggingOptionsResult> putLoggingOptionsAsync(final PutLoggingOptionsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<PutLoggingOptionsRequest, PutLoggingOptionsResult> asyncHandler) {
+        final PutLoggingOptionsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<PutLoggingOptionsResult>() {
+            @Override
+            public PutLoggingOptionsResult call() throws Exception {
+                PutLoggingOptionsResult result = null;
+
+                try {
+                    result = executePutLoggingOptions(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest request) {
+
+        return tagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(final TagResourceRequest request,
+            final com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult> asyncHandler) {
+        final TagResourceRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<TagResourceResult>() {
+            @Override
+            public TagResourceResult call() throws Exception {
+                TagResourceResult result = null;
+
+                try {
+                    result = executeTagResource(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest request) {
+
+        return untagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(final UntagResourceRequest request,
+            final com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler) {
+        final UntagResourceRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<UntagResourceResult>() {
+            @Override
+            public UntagResourceResult call() throws Exception {
+                UntagResourceResult result = null;
+
+                try {
+                    result = executeUntagResource(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateDetectorModelResult> updateDetectorModelAsync(UpdateDetectorModelRequest request) {
+
+        return updateDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateDetectorModelResult> updateDetectorModelAsync(final UpdateDetectorModelRequest request,
+            final com.amazonaws.handlers.AsyncHandler<UpdateDetectorModelRequest, UpdateDetectorModelResult> asyncHandler) {
+        final UpdateDetectorModelRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<UpdateDetectorModelResult>() {
+            @Override
+            public UpdateDetectorModelResult call() throws Exception {
+                UpdateDetectorModelResult result = null;
+
+                try {
+                    result = executeUpdateDetectorModel(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateInputResult> updateInputAsync(UpdateInputRequest request) {
+
+        return updateInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateInputResult> updateInputAsync(final UpdateInputRequest request,
+            final com.amazonaws.handlers.AsyncHandler<UpdateInputRequest, UpdateInputResult> asyncHandler) {
+        final UpdateInputRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<UpdateInputResult>() {
+            @Override
+            public UpdateInputResult call() throws Exception {
+                UpdateInputResult result = null;
+
+                try {
+                    result = executeUpdateInput(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    /**
+     * Shuts down the client, releasing all managed resources. This includes forcibly terminating all pending
+     * asynchronous service calls. Clients who wish to give pending asynchronous service calls time to complete should
+     * call {@code getExecutorService().shutdown()} followed by {@code getExecutorService().awaitTermination()} prior to
+     * calling this method.
+     */
+    @Override
+    public void shutdown() {
+        super.shutdown();
+        executorService.shutdownNow();
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsyncClientBuilder.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsyncClientBuilder.java
new file mode 100644
index 000000000000..567c69ac2739
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsAsyncClientBuilder.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.ClientConfigurationFactory;
+import com.amazonaws.annotation.NotThreadSafe;
+import com.amazonaws.client.builder.AwsAsyncClientBuilder;
+import com.amazonaws.client.AwsAsyncClientParams;
+
+/**
+ * Fluent builder for {@link com.amazonaws.services.iotevents.AWSIoTEventsAsync}. Use of the builder is preferred over
+ * using constructors of the client class.
+ **/
+@NotThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public final class AWSIoTEventsAsyncClientBuilder extends AwsAsyncClientBuilder<AWSIoTEventsAsyncClientBuilder, AWSIoTEventsAsync> {
+
+    private static final ClientConfigurationFactory CLIENT_CONFIG_FACTORY = new ClientConfigurationFactory();;
+
+    /**
+     * @return Create new instance of builder with all defaults set.
+     */
+    public static AWSIoTEventsAsyncClientBuilder standard() {
+        return new AWSIoTEventsAsyncClientBuilder();
+    }
+
+    /**
+     * @return Default async client using the {@link com.amazonaws.auth.DefaultAWSCredentialsProviderChain} and
+     *         {@link com.amazonaws.regions.DefaultAwsRegionProviderChain} chain
+     */
+    public static AWSIoTEventsAsync defaultClient() {
+        return standard().build();
+    }
+
+    private AWSIoTEventsAsyncClientBuilder() {
+        super(CLIENT_CONFIG_FACTORY);
+    }
+
+    /**
+     * Construct an asynchronous implementation of AWSIoTEventsAsync using the current builder configuration.
+     *
+     * @param params
+     *        Current builder configuration represented as a parameter object.
+     * @return Fully configured implementation of AWSIoTEventsAsync.
+     */
+    @Override
+    protected AWSIoTEventsAsync build(AwsAsyncClientParams params) {
+        return new AWSIoTEventsAsyncClient(params);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsClient.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsClient.java
new file mode 100644
index 000000000000..8a986e001e6b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsClient.java
@@ -0,0 +1,1266 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import org.w3c.dom.*;
+
+import java.net.*;
+import java.util.*;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.logging.*;
+
+import com.amazonaws.*;
+import com.amazonaws.annotation.SdkInternalApi;
+import com.amazonaws.auth.*;
+
+import com.amazonaws.handlers.*;
+import com.amazonaws.http.*;
+import com.amazonaws.internal.*;
+import com.amazonaws.internal.auth.*;
+import com.amazonaws.metrics.*;
+import com.amazonaws.regions.*;
+import com.amazonaws.transform.*;
+import com.amazonaws.util.*;
+import com.amazonaws.protocol.json.*;
+import com.amazonaws.util.AWSRequestMetrics.Field;
+import com.amazonaws.annotation.ThreadSafe;
+import com.amazonaws.client.AwsSyncClientParams;
+import com.amazonaws.client.builder.AdvancedConfig;
+
+import com.amazonaws.services.iotevents.AWSIoTEventsClientBuilder;
+
+import com.amazonaws.AmazonServiceException;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.services.iotevents.model.transform.*;
+
+/**
+ * Client for accessing AWS IoT Events. All service calls made using this client are blocking, and will not return until
+ * the service call completes.
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@ThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AWSIoTEventsClient extends AmazonWebServiceClient implements AWSIoTEvents {
+
+    /** Provider for AWS credentials. */
+    private final AWSCredentialsProvider awsCredentialsProvider;
+
+    private static final Log log = LogFactory.getLog(AWSIoTEvents.class);
+
+    /** Default signing name for the service. */
+    private static final String DEFAULT_SIGNING_NAME = "iotevents";
+
+    /** Client configuration factory providing ClientConfigurations tailored to this client */
+    protected static final ClientConfigurationFactory configFactory = new ClientConfigurationFactory();
+
+    private final AdvancedConfig advancedConfig;
+
+    private static final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory = new com.amazonaws.protocol.json.SdkJsonProtocolFactory(
+            new JsonClientMetadata()
+                    .withProtocolVersion("1.1")
+                    .withSupportsCbor(false)
+                    .withSupportsIon(false)
+                    .withContentTypeOverride("")
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InternalFailureException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.InternalFailureException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ResourceInUseException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.ResourceInUseException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InvalidRequestException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.InvalidRequestException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ResourceNotFoundException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.ResourceNotFoundException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("UnsupportedOperationException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.UnsupportedOperationException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ThrottlingException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.ThrottlingException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ServiceUnavailableException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.ServiceUnavailableException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ResourceAlreadyExistsException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.ResourceAlreadyExistsException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("LimitExceededException").withModeledClass(
+                                    com.amazonaws.services.iotevents.model.LimitExceededException.class))
+                    .withBaseServiceExceptionClass(com.amazonaws.services.iotevents.model.AWSIoTEventsException.class));
+
+    public static AWSIoTEventsClientBuilder builder() {
+        return AWSIoTEventsClientBuilder.standard();
+    }
+
+    /**
+     * Constructs a new client to invoke service methods on AWS IoT Events using the specified parameters.
+     *
+     * <p>
+     * All service calls made using this new client object are blocking, and will not return until the service call
+     * completes.
+     *
+     * @param clientParams
+     *        Object providing client parameters.
+     */
+    AWSIoTEventsClient(AwsSyncClientParams clientParams) {
+        this(clientParams, false);
+    }
+
+    /**
+     * Constructs a new client to invoke service methods on AWS IoT Events using the specified parameters.
+     *
+     * <p>
+     * All service calls made using this new client object are blocking, and will not return until the service call
+     * completes.
+     *
+     * @param clientParams
+     *        Object providing client parameters.
+     */
+    AWSIoTEventsClient(AwsSyncClientParams clientParams, boolean endpointDiscoveryEnabled) {
+        super(clientParams);
+        this.awsCredentialsProvider = clientParams.getCredentialsProvider();
+        this.advancedConfig = clientParams.getAdvancedConfig();
+        init();
+    }
+
+    private void init() {
+        setServiceNameIntern(DEFAULT_SIGNING_NAME);
+        setEndpointPrefix(ENDPOINT_PREFIX);
+        // calling this.setEndPoint(...) will also modify the signer accordingly
+        setEndpoint("iotevents.us-east-1.amazonaws.com");
+        HandlerChainFactory chainFactory = new HandlerChainFactory();
+        requestHandler2s.addAll(chainFactory.newRequestHandlerChain("/com/amazonaws/services/iotevents/request.handlers"));
+        requestHandler2s.addAll(chainFactory.newRequestHandler2Chain("/com/amazonaws/services/iotevents/request.handler2s"));
+        requestHandler2s.addAll(chainFactory.getGlobalHandlers());
+    }
+
+    /**
+     * <p>
+     * Creates a detector model.
+     * </p>
+     * 
+     * @param createDetectorModelRequest
+     * @return Result of the CreateDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ResourceAlreadyExistsException
+     *         The resource already exists.
+     * @throws LimitExceededException
+     *         A limit was exceeded.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.CreateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public CreateDetectorModelResult createDetectorModel(CreateDetectorModelRequest request) {
+        request = beforeClientExecution(request);
+        return executeCreateDetectorModel(request);
+    }
+
+    @SdkInternalApi
+    final CreateDetectorModelResult executeCreateDetectorModel(CreateDetectorModelRequest createDetectorModelRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(createDetectorModelRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<CreateDetectorModelRequest> request = null;
+        Response<CreateDetectorModelResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new CreateDetectorModelRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(createDetectorModelRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "CreateDetectorModel");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<CreateDetectorModelResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new CreateDetectorModelResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Creates an input.
+     * </p>
+     * 
+     * @param createInputRequest
+     * @return Result of the CreateInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ResourceAlreadyExistsException
+     *         The resource already exists.
+     * @sample AWSIoTEvents.CreateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public CreateInputResult createInput(CreateInputRequest request) {
+        request = beforeClientExecution(request);
+        return executeCreateInput(request);
+    }
+
+    @SdkInternalApi
+    final CreateInputResult executeCreateInput(CreateInputRequest createInputRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(createInputRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<CreateInputRequest> request = null;
+        Response<CreateInputResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new CreateInputRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(createInputRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "CreateInput");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<CreateInputResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new CreateInputResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Deletes a detector model. Any active instances of the detector model are also deleted.
+     * </p>
+     * 
+     * @param deleteDetectorModelRequest
+     * @return Result of the DeleteDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.DeleteDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public DeleteDetectorModelResult deleteDetectorModel(DeleteDetectorModelRequest request) {
+        request = beforeClientExecution(request);
+        return executeDeleteDetectorModel(request);
+    }
+
+    @SdkInternalApi
+    final DeleteDetectorModelResult executeDeleteDetectorModel(DeleteDetectorModelRequest deleteDetectorModelRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(deleteDetectorModelRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DeleteDetectorModelRequest> request = null;
+        Response<DeleteDetectorModelResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DeleteDetectorModelRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(deleteDetectorModelRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DeleteDetectorModel");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DeleteDetectorModelResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new DeleteDetectorModelResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Deletes an input.
+     * </p>
+     * 
+     * @param deleteInputRequest
+     * @return Result of the DeleteInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @sample AWSIoTEvents.DeleteInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public DeleteInputResult deleteInput(DeleteInputRequest request) {
+        request = beforeClientExecution(request);
+        return executeDeleteInput(request);
+    }
+
+    @SdkInternalApi
+    final DeleteInputResult executeDeleteInput(DeleteInputRequest deleteInputRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(deleteInputRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DeleteInputRequest> request = null;
+        Response<DeleteInputResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DeleteInputRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(deleteInputRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DeleteInput");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DeleteInputResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new DeleteInputResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest
+     * version is returned.
+     * </p>
+     * 
+     * @param describeDetectorModelRequest
+     * @return Result of the DescribeDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.DescribeDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeDetectorModel"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public DescribeDetectorModelResult describeDetectorModel(DescribeDetectorModelRequest request) {
+        request = beforeClientExecution(request);
+        return executeDescribeDetectorModel(request);
+    }
+
+    @SdkInternalApi
+    final DescribeDetectorModelResult executeDescribeDetectorModel(DescribeDetectorModelRequest describeDetectorModelRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(describeDetectorModelRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DescribeDetectorModelRequest> request = null;
+        Response<DescribeDetectorModelResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DescribeDetectorModelRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(describeDetectorModelRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DescribeDetectorModel");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DescribeDetectorModelResult>> responseHandler = protocolFactory
+                    .createResponseHandler(new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                            new DescribeDetectorModelResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Describes an input.
+     * </p>
+     * 
+     * @param describeInputRequest
+     * @return Result of the DescribeInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.DescribeInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public DescribeInputResult describeInput(DescribeInputRequest request) {
+        request = beforeClientExecution(request);
+        return executeDescribeInput(request);
+    }
+
+    @SdkInternalApi
+    final DescribeInputResult executeDescribeInput(DescribeInputRequest describeInputRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(describeInputRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DescribeInputRequest> request = null;
+        Response<DescribeInputResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DescribeInputRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(describeInputRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DescribeInput");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DescribeInputResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new DescribeInputResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Retrieves the current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param describeLoggingOptionsRequest
+     * @return Result of the DescribeLoggingOptions operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws UnsupportedOperationException
+     *         The requested operation is not supported.
+     * @sample AWSIoTEvents.DescribeLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeLoggingOptions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public DescribeLoggingOptionsResult describeLoggingOptions(DescribeLoggingOptionsRequest request) {
+        request = beforeClientExecution(request);
+        return executeDescribeLoggingOptions(request);
+    }
+
+    @SdkInternalApi
+    final DescribeLoggingOptionsResult executeDescribeLoggingOptions(DescribeLoggingOptionsRequest describeLoggingOptionsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(describeLoggingOptionsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DescribeLoggingOptionsRequest> request = null;
+        Response<DescribeLoggingOptionsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DescribeLoggingOptionsRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(describeLoggingOptionsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DescribeLoggingOptions");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DescribeLoggingOptionsResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                    new DescribeLoggingOptionsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Lists all the versions of a detector model. Only the metadata associated with each detector model version is
+     * returned.
+     * </p>
+     * 
+     * @param listDetectorModelVersionsRequest
+     * @return Result of the ListDetectorModelVersions operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.ListDetectorModelVersions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModelVersions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public ListDetectorModelVersionsResult listDetectorModelVersions(ListDetectorModelVersionsRequest request) {
+        request = beforeClientExecution(request);
+        return executeListDetectorModelVersions(request);
+    }
+
+    @SdkInternalApi
+    final ListDetectorModelVersionsResult executeListDetectorModelVersions(ListDetectorModelVersionsRequest listDetectorModelVersionsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listDetectorModelVersionsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListDetectorModelVersionsRequest> request = null;
+        Response<ListDetectorModelVersionsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListDetectorModelVersionsRequestProtocolMarshaller(protocolFactory).marshall(super
+                        .beforeMarshalling(listDetectorModelVersionsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListDetectorModelVersions");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListDetectorModelVersionsResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                    new ListDetectorModelVersionsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Lists the detector models you have created. Only the metadata associated with each detector model is returned.
+     * </p>
+     * 
+     * @param listDetectorModelsRequest
+     * @return Result of the ListDetectorModels operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.ListDetectorModels
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModels" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public ListDetectorModelsResult listDetectorModels(ListDetectorModelsRequest request) {
+        request = beforeClientExecution(request);
+        return executeListDetectorModels(request);
+    }
+
+    @SdkInternalApi
+    final ListDetectorModelsResult executeListDetectorModels(ListDetectorModelsRequest listDetectorModelsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listDetectorModelsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListDetectorModelsRequest> request = null;
+        Response<ListDetectorModelsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListDetectorModelsRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(listDetectorModelsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListDetectorModels");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListDetectorModelsResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new ListDetectorModelsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Lists the inputs you have created.
+     * </p>
+     * 
+     * @param listInputsRequest
+     * @return Result of the ListInputs operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.ListInputs
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListInputs" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public ListInputsResult listInputs(ListInputsRequest request) {
+        request = beforeClientExecution(request);
+        return executeListInputs(request);
+    }
+
+    @SdkInternalApi
+    final ListInputsResult executeListInputs(ListInputsRequest listInputsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listInputsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListInputsRequest> request = null;
+        Response<ListInputsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListInputsRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(listInputsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListInputs");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListInputsResult>> responseHandler = protocolFactory.createResponseHandler(new JsonOperationMetadata()
+                    .withPayloadJson(true).withHasStreamingSuccessResponse(false), new ListInputsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Lists the tags (metadata) you have assigned to the resource.
+     * </p>
+     * 
+     * @param listTagsForResourceRequest
+     * @return Result of the ListTagsForResource operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @sample AWSIoTEvents.ListTagsForResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListTagsForResource" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public ListTagsForResourceResult listTagsForResource(ListTagsForResourceRequest request) {
+        request = beforeClientExecution(request);
+        return executeListTagsForResource(request);
+    }
+
+    @SdkInternalApi
+    final ListTagsForResourceResult executeListTagsForResource(ListTagsForResourceRequest listTagsForResourceRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listTagsForResourceRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListTagsForResourceRequest> request = null;
+        Response<ListTagsForResourceResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListTagsForResourceRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(listTagsForResourceRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListTagsForResource");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListTagsForResourceResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new ListTagsForResourceResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Sets or updates the AWS IoT Events logging options.
+     * </p>
+     * <p>
+     * Note that if you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the
+     * change to take effect. Also, if you change the policy attached to the role you specified in the roleArn field
+     * (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.
+     * </p>
+     * 
+     * @param putLoggingOptionsRequest
+     * @return Result of the PutLoggingOptions operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws UnsupportedOperationException
+     *         The requested operation is not supported.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @sample AWSIoTEvents.PutLoggingOptions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/PutLoggingOptions" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public PutLoggingOptionsResult putLoggingOptions(PutLoggingOptionsRequest request) {
+        request = beforeClientExecution(request);
+        return executePutLoggingOptions(request);
+    }
+
+    @SdkInternalApi
+    final PutLoggingOptionsResult executePutLoggingOptions(PutLoggingOptionsRequest putLoggingOptionsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(putLoggingOptionsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<PutLoggingOptionsRequest> request = null;
+        Response<PutLoggingOptionsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new PutLoggingOptionsRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(putLoggingOptionsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "PutLoggingOptions");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<PutLoggingOptionsResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new PutLoggingOptionsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Add to or modifies the tags of the given resource. Tags are metadata which can be used to manage a resource.
+     * </p>
+     * 
+     * @param tagResourceRequest
+     * @return Result of the TagResource operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws LimitExceededException
+     *         A limit was exceeded.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @sample AWSIoTEvents.TagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public TagResourceResult tagResource(TagResourceRequest request) {
+        request = beforeClientExecution(request);
+        return executeTagResource(request);
+    }
+
+    @SdkInternalApi
+    final TagResourceResult executeTagResource(TagResourceRequest tagResourceRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(tagResourceRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<TagResourceRequest> request = null;
+        Response<TagResourceResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new TagResourceRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(tagResourceRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "TagResource");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<TagResourceResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new TagResourceResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Removes the given tags (metadata) from the resource.
+     * </p>
+     * 
+     * @param untagResourceRequest
+     * @return Result of the UntagResource operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @sample AWSIoTEvents.UntagResource
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UntagResource" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public UntagResourceResult untagResource(UntagResourceRequest request) {
+        request = beforeClientExecution(request);
+        return executeUntagResource(request);
+    }
+
+    @SdkInternalApi
+    final UntagResourceResult executeUntagResource(UntagResourceRequest untagResourceRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(untagResourceRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<UntagResourceRequest> request = null;
+        Response<UntagResourceResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new UntagResourceRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(untagResourceRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UntagResource");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<UntagResourceResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new UntagResourceResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Updates a detector model. Detectors (instances) spawned by the previous version will be deleted and re-created as
+     * new inputs arrive.
+     * </p>
+     * 
+     * @param updateDetectorModelRequest
+     * @return Result of the UpdateDetectorModel operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEvents.UpdateDetectorModel
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateDetectorModel" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public UpdateDetectorModelResult updateDetectorModel(UpdateDetectorModelRequest request) {
+        request = beforeClientExecution(request);
+        return executeUpdateDetectorModel(request);
+    }
+
+    @SdkInternalApi
+    final UpdateDetectorModelResult executeUpdateDetectorModel(UpdateDetectorModelRequest updateDetectorModelRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(updateDetectorModelRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<UpdateDetectorModelRequest> request = null;
+        Response<UpdateDetectorModelResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new UpdateDetectorModelRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(updateDetectorModelRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UpdateDetectorModel");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<UpdateDetectorModelResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new UpdateDetectorModelResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Updates an input.
+     * </p>
+     * 
+     * @param updateInputRequest
+     * @return Result of the UpdateInput operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws InternalFailureException
+     *         An internal failure occurred.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ResourceInUseException
+     *         The resource is in use.
+     * @sample AWSIoTEvents.UpdateInput
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateInput" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public UpdateInputResult updateInput(UpdateInputRequest request) {
+        request = beforeClientExecution(request);
+        return executeUpdateInput(request);
+    }
+
+    @SdkInternalApi
+    final UpdateInputResult executeUpdateInput(UpdateInputRequest updateInputRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(updateInputRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<UpdateInputRequest> request = null;
+        Response<UpdateInputResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new UpdateInputRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(updateInputRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UpdateInput");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<UpdateInputResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new UpdateInputResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * Returns additional metadata for a previously executed successful, request, typically used for debugging issues
+     * where a service isn't acting as expected. This data isn't considered part of the result data returned by an
+     * operation, so it's available through this separate, diagnostic interface.
+     * <p>
+     * Response metadata is only cached for a limited period of time, so if you need to access this extra diagnostic
+     * information for an executed request, you should use this method to retrieve it as soon as possible after
+     * executing the request.
+     *
+     * @param request
+     *        The originally executed request
+     *
+     * @return The response metadata for the specified request, or null if none is available.
+     */
+    public ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request) {
+        return client.getResponseMetadataForRequest(request);
+    }
+
+    /**
+     * Normal invoke with authentication. Credentials are required and may be overriden at the request level.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> invoke(Request<Y> request, HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler,
+            ExecutionContext executionContext) {
+
+        return invoke(request, responseHandler, executionContext, null, null);
+    }
+
+    /**
+     * Normal invoke with authentication. Credentials are required and may be overriden at the request level.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> invoke(Request<Y> request, HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler,
+            ExecutionContext executionContext, URI cachedEndpoint, URI uriFromEndpointTrait) {
+
+        executionContext.setCredentialsProvider(CredentialUtils.getCredentialsProvider(request.getOriginalRequest(), awsCredentialsProvider));
+
+        return doInvoke(request, responseHandler, executionContext, cachedEndpoint, uriFromEndpointTrait);
+    }
+
+    /**
+     * Invoke with no authentication. Credentials are not required and any credentials set on the client or request will
+     * be ignored for this operation.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> anonymousInvoke(Request<Y> request,
+            HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler, ExecutionContext executionContext) {
+
+        return doInvoke(request, responseHandler, executionContext, null, null);
+    }
+
+    /**
+     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been configured in the
+     * ExecutionContext beforehand.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> doInvoke(Request<Y> request, HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler,
+            ExecutionContext executionContext, URI discoveredEndpoint, URI uriFromEndpointTrait) {
+
+        if (discoveredEndpoint != null) {
+            request.setEndpoint(discoveredEndpoint);
+            request.getOriginalRequest().getRequestClientOptions().appendUserAgent("endpoint-discovery");
+        } else if (uriFromEndpointTrait != null) {
+            request.setEndpoint(uriFromEndpointTrait);
+        } else {
+            request.setEndpoint(endpoint);
+        }
+
+        request.setTimeOffset(timeOffset);
+
+        HttpResponseHandler<AmazonServiceException> errorResponseHandler = protocolFactory.createErrorResponseHandler(new JsonErrorResponseMetadata());
+
+        return client.execute(request, responseHandler, errorResponseHandler, executionContext);
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    static com.amazonaws.protocol.json.SdkJsonProtocolFactory getProtocolFactory() {
+        return protocolFactory;
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsClientBuilder.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsClientBuilder.java
new file mode 100644
index 000000000000..df3603a34322
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AWSIoTEventsClientBuilder.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.ClientConfigurationFactory;
+
+import com.amazonaws.annotation.NotThreadSafe;
+import com.amazonaws.client.builder.AwsSyncClientBuilder;
+import com.amazonaws.client.AwsSyncClientParams;
+
+/**
+ * Fluent builder for {@link com.amazonaws.services.iotevents.AWSIoTEvents}. Use of the builder is preferred over using
+ * constructors of the client class.
+ **/
+@NotThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public final class AWSIoTEventsClientBuilder extends AwsSyncClientBuilder<AWSIoTEventsClientBuilder, AWSIoTEvents> {
+
+    private static final ClientConfigurationFactory CLIENT_CONFIG_FACTORY = new ClientConfigurationFactory();
+
+    /**
+     * @return Create new instance of builder with all defaults set.
+     */
+    public static AWSIoTEventsClientBuilder standard() {
+        return new AWSIoTEventsClientBuilder();
+    }
+
+    /**
+     * @return Default client using the {@link com.amazonaws.auth.DefaultAWSCredentialsProviderChain} and
+     *         {@link com.amazonaws.regions.DefaultAwsRegionProviderChain} chain
+     */
+    public static AWSIoTEvents defaultClient() {
+        return standard().build();
+    }
+
+    private AWSIoTEventsClientBuilder() {
+        super(CLIENT_CONFIG_FACTORY);
+    }
+
+    /**
+     * Construct a synchronous implementation of AWSIoTEvents using the current builder configuration.
+     *
+     * @param params
+     *        Current builder configuration represented as a parameter object.
+     * @return Fully configured implementation of AWSIoTEvents.
+     */
+    @Override
+    protected AWSIoTEvents build(AwsSyncClientParams params) {
+        return new AWSIoTEventsClient(params);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AbstractAWSIoTEvents.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AbstractAWSIoTEvents.java
new file mode 100644
index 000000000000..d8737323144e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AbstractAWSIoTEvents.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.*;
+
+/**
+ * Abstract implementation of {@code AWSIoTEvents}. Convenient method forms pass through to the corresponding overload
+ * that takes a request object, which throws an {@code UnsupportedOperationException}.
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AbstractAWSIoTEvents implements AWSIoTEvents {
+
+    protected AbstractAWSIoTEvents() {
+    }
+
+    @Override
+    public CreateDetectorModelResult createDetectorModel(CreateDetectorModelRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public CreateInputResult createInput(CreateInputRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public DeleteDetectorModelResult deleteDetectorModel(DeleteDetectorModelRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public DeleteInputResult deleteInput(DeleteInputRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public DescribeDetectorModelResult describeDetectorModel(DescribeDetectorModelRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public DescribeInputResult describeInput(DescribeInputRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public DescribeLoggingOptionsResult describeLoggingOptions(DescribeLoggingOptionsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public ListDetectorModelVersionsResult listDetectorModelVersions(ListDetectorModelVersionsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public ListDetectorModelsResult listDetectorModels(ListDetectorModelsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public ListInputsResult listInputs(ListInputsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public ListTagsForResourceResult listTagsForResource(ListTagsForResourceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public PutLoggingOptionsResult putLoggingOptions(PutLoggingOptionsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public TagResourceResult tagResource(TagResourceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public UntagResourceResult untagResource(UntagResourceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public UpdateDetectorModelResult updateDetectorModel(UpdateDetectorModelRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public UpdateInputResult updateInput(UpdateInputRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public void shutdown() {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public com.amazonaws.ResponseMetadata getCachedResponseMetadata(com.amazonaws.AmazonWebServiceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AbstractAWSIoTEventsAsync.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AbstractAWSIoTEventsAsync.java
new file mode 100644
index 000000000000..370bf2e0760b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/AbstractAWSIoTEventsAsync.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2014-2019 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.iotevents;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+
+/**
+ * Abstract implementation of {@code AWSIoTEventsAsync}. Convenient method forms pass through to the corresponding
+ * overload that takes a request object and an {@code AsyncHandler}, which throws an
+ * {@code UnsupportedOperationException}.
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AbstractAWSIoTEventsAsync extends AbstractAWSIoTEvents implements AWSIoTEventsAsync {
+
+    protected AbstractAWSIoTEventsAsync() {
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateDetectorModelResult> createDetectorModelAsync(CreateDetectorModelRequest request) {
+
+        return createDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateDetectorModelResult> createDetectorModelAsync(CreateDetectorModelRequest request,
+            com.amazonaws.handlers.AsyncHandler<CreateDetectorModelRequest, CreateDetectorModelResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateInputResult> createInputAsync(CreateInputRequest request) {
+
+        return createInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<CreateInputResult> createInputAsync(CreateInputRequest request,
+            com.amazonaws.handlers.AsyncHandler<CreateInputRequest, CreateInputResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteDetectorModelResult> deleteDetectorModelAsync(DeleteDetectorModelRequest request) {
+
+        return deleteDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteDetectorModelResult> deleteDetectorModelAsync(DeleteDetectorModelRequest request,
+            com.amazonaws.handlers.AsyncHandler<DeleteDetectorModelRequest, DeleteDetectorModelResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteInputResult> deleteInputAsync(DeleteInputRequest request) {
+
+        return deleteInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DeleteInputResult> deleteInputAsync(DeleteInputRequest request,
+            com.amazonaws.handlers.AsyncHandler<DeleteInputRequest, DeleteInputResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorModelResult> describeDetectorModelAsync(DescribeDetectorModelRequest request) {
+
+        return describeDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorModelResult> describeDetectorModelAsync(DescribeDetectorModelRequest request,
+            com.amazonaws.handlers.AsyncHandler<DescribeDetectorModelRequest, DescribeDetectorModelResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeInputResult> describeInputAsync(DescribeInputRequest request) {
+
+        return describeInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeInputResult> describeInputAsync(DescribeInputRequest request,
+            com.amazonaws.handlers.AsyncHandler<DescribeInputRequest, DescribeInputResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeLoggingOptionsResult> describeLoggingOptionsAsync(DescribeLoggingOptionsRequest request) {
+
+        return describeLoggingOptionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeLoggingOptionsResult> describeLoggingOptionsAsync(DescribeLoggingOptionsRequest request,
+            com.amazonaws.handlers.AsyncHandler<DescribeLoggingOptionsRequest, DescribeLoggingOptionsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelVersionsResult> listDetectorModelVersionsAsync(ListDetectorModelVersionsRequest request) {
+
+        return listDetectorModelVersionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelVersionsResult> listDetectorModelVersionsAsync(ListDetectorModelVersionsRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListDetectorModelVersionsRequest, ListDetectorModelVersionsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelsResult> listDetectorModelsAsync(ListDetectorModelsRequest request) {
+
+        return listDetectorModelsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorModelsResult> listDetectorModelsAsync(ListDetectorModelsRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListDetectorModelsRequest, ListDetectorModelsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListInputsResult> listInputsAsync(ListInputsRequest request) {
+
+        return listInputsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListInputsResult> listInputsAsync(ListInputsRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListInputsRequest, ListInputsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest request) {
+
+        return listTagsForResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(ListTagsForResourceRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<PutLoggingOptionsResult> putLoggingOptionsAsync(PutLoggingOptionsRequest request) {
+
+        return putLoggingOptionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<PutLoggingOptionsResult> putLoggingOptionsAsync(PutLoggingOptionsRequest request,
+            com.amazonaws.handlers.AsyncHandler<PutLoggingOptionsRequest, PutLoggingOptionsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest request) {
+
+        return tagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceRequest request,
+            com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest request) {
+
+        return untagResourceAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest request,
+            com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateDetectorModelResult> updateDetectorModelAsync(UpdateDetectorModelRequest request) {
+
+        return updateDetectorModelAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateDetectorModelResult> updateDetectorModelAsync(UpdateDetectorModelRequest request,
+            com.amazonaws.handlers.AsyncHandler<UpdateDetectorModelRequest, UpdateDetectorModelResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateInputResult> updateInputAsync(UpdateInputRequest request) {
+
+        return updateInputAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateInputResult> updateInputAsync(UpdateInputRequest request,
+            com.amazonaws.handlers.AsyncHandler<UpdateInputRequest, UpdateInputResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/AWSIoTEventsException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/AWSIoTEventsException.java
new file mode 100644
index 000000000000..f11cd3bcb92c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/AWSIoTEventsException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * Base exception for all service exceptions thrown by AWS IoT Events
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AWSIoTEventsException extends com.amazonaws.AmazonServiceException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new AWSIoTEventsException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public AWSIoTEventsException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Action.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Action.java
new file mode 100644
index 000000000000..7abb50ea16db
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Action.java
@@ -0,0 +1,401 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * An action to be performed when the <code>condition</code> is TRUE.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/Action" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Action implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Sets a variable to a specified value.
+     * </p>
+     */
+    private SetVariableAction setVariable;
+    /**
+     * <p>
+     * Sends an Amazon SNS message.
+     * </p>
+     */
+    private SNSTopicPublishAction sns;
+    /**
+     * <p>
+     * Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     * </p>
+     */
+    private IotTopicPublishAction iotTopicPublish;
+    /**
+     * <p>
+     * Information needed to set the timer.
+     * </p>
+     */
+    private SetTimerAction setTimer;
+    /**
+     * <p>
+     * Information needed to clear the timer.
+     * </p>
+     */
+    private ClearTimerAction clearTimer;
+    /**
+     * <p>
+     * Information needed to reset the timer.
+     * </p>
+     */
+    private ResetTimerAction resetTimer;
+
+    /**
+     * <p>
+     * Sets a variable to a specified value.
+     * </p>
+     * 
+     * @param setVariable
+     *        Sets a variable to a specified value.
+     */
+
+    public void setSetVariable(SetVariableAction setVariable) {
+        this.setVariable = setVariable;
+    }
+
+    /**
+     * <p>
+     * Sets a variable to a specified value.
+     * </p>
+     * 
+     * @return Sets a variable to a specified value.
+     */
+
+    public SetVariableAction getSetVariable() {
+        return this.setVariable;
+    }
+
+    /**
+     * <p>
+     * Sets a variable to a specified value.
+     * </p>
+     * 
+     * @param setVariable
+     *        Sets a variable to a specified value.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Action withSetVariable(SetVariableAction setVariable) {
+        setSetVariable(setVariable);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Sends an Amazon SNS message.
+     * </p>
+     * 
+     * @param sns
+     *        Sends an Amazon SNS message.
+     */
+
+    public void setSns(SNSTopicPublishAction sns) {
+        this.sns = sns;
+    }
+
+    /**
+     * <p>
+     * Sends an Amazon SNS message.
+     * </p>
+     * 
+     * @return Sends an Amazon SNS message.
+     */
+
+    public SNSTopicPublishAction getSns() {
+        return this.sns;
+    }
+
+    /**
+     * <p>
+     * Sends an Amazon SNS message.
+     * </p>
+     * 
+     * @param sns
+     *        Sends an Amazon SNS message.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Action withSns(SNSTopicPublishAction sns) {
+        setSns(sns);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     * </p>
+     * 
+     * @param iotTopicPublish
+     *        Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     */
+
+    public void setIotTopicPublish(IotTopicPublishAction iotTopicPublish) {
+        this.iotTopicPublish = iotTopicPublish;
+    }
+
+    /**
+     * <p>
+     * Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     * </p>
+     * 
+     * @return Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     */
+
+    public IotTopicPublishAction getIotTopicPublish() {
+        return this.iotTopicPublish;
+    }
+
+    /**
+     * <p>
+     * Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     * </p>
+     * 
+     * @param iotTopicPublish
+     *        Publishes an MQTT message with the given topic to the AWS IoT Message Broker.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Action withIotTopicPublish(IotTopicPublishAction iotTopicPublish) {
+        setIotTopicPublish(iotTopicPublish);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information needed to set the timer.
+     * </p>
+     * 
+     * @param setTimer
+     *        Information needed to set the timer.
+     */
+
+    public void setSetTimer(SetTimerAction setTimer) {
+        this.setTimer = setTimer;
+    }
+
+    /**
+     * <p>
+     * Information needed to set the timer.
+     * </p>
+     * 
+     * @return Information needed to set the timer.
+     */
+
+    public SetTimerAction getSetTimer() {
+        return this.setTimer;
+    }
+
+    /**
+     * <p>
+     * Information needed to set the timer.
+     * </p>
+     * 
+     * @param setTimer
+     *        Information needed to set the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Action withSetTimer(SetTimerAction setTimer) {
+        setSetTimer(setTimer);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information needed to clear the timer.
+     * </p>
+     * 
+     * @param clearTimer
+     *        Information needed to clear the timer.
+     */
+
+    public void setClearTimer(ClearTimerAction clearTimer) {
+        this.clearTimer = clearTimer;
+    }
+
+    /**
+     * <p>
+     * Information needed to clear the timer.
+     * </p>
+     * 
+     * @return Information needed to clear the timer.
+     */
+
+    public ClearTimerAction getClearTimer() {
+        return this.clearTimer;
+    }
+
+    /**
+     * <p>
+     * Information needed to clear the timer.
+     * </p>
+     * 
+     * @param clearTimer
+     *        Information needed to clear the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Action withClearTimer(ClearTimerAction clearTimer) {
+        setClearTimer(clearTimer);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information needed to reset the timer.
+     * </p>
+     * 
+     * @param resetTimer
+     *        Information needed to reset the timer.
+     */
+
+    public void setResetTimer(ResetTimerAction resetTimer) {
+        this.resetTimer = resetTimer;
+    }
+
+    /**
+     * <p>
+     * Information needed to reset the timer.
+     * </p>
+     * 
+     * @return Information needed to reset the timer.
+     */
+
+    public ResetTimerAction getResetTimer() {
+        return this.resetTimer;
+    }
+
+    /**
+     * <p>
+     * Information needed to reset the timer.
+     * </p>
+     * 
+     * @param resetTimer
+     *        Information needed to reset the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Action withResetTimer(ResetTimerAction resetTimer) {
+        setResetTimer(resetTimer);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getSetVariable() != null)
+            sb.append("SetVariable: ").append(getSetVariable()).append(",");
+        if (getSns() != null)
+            sb.append("Sns: ").append(getSns()).append(",");
+        if (getIotTopicPublish() != null)
+            sb.append("IotTopicPublish: ").append(getIotTopicPublish()).append(",");
+        if (getSetTimer() != null)
+            sb.append("SetTimer: ").append(getSetTimer()).append(",");
+        if (getClearTimer() != null)
+            sb.append("ClearTimer: ").append(getClearTimer()).append(",");
+        if (getResetTimer() != null)
+            sb.append("ResetTimer: ").append(getResetTimer());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Action == false)
+            return false;
+        Action other = (Action) obj;
+        if (other.getSetVariable() == null ^ this.getSetVariable() == null)
+            return false;
+        if (other.getSetVariable() != null && other.getSetVariable().equals(this.getSetVariable()) == false)
+            return false;
+        if (other.getSns() == null ^ this.getSns() == null)
+            return false;
+        if (other.getSns() != null && other.getSns().equals(this.getSns()) == false)
+            return false;
+        if (other.getIotTopicPublish() == null ^ this.getIotTopicPublish() == null)
+            return false;
+        if (other.getIotTopicPublish() != null && other.getIotTopicPublish().equals(this.getIotTopicPublish()) == false)
+            return false;
+        if (other.getSetTimer() == null ^ this.getSetTimer() == null)
+            return false;
+        if (other.getSetTimer() != null && other.getSetTimer().equals(this.getSetTimer()) == false)
+            return false;
+        if (other.getClearTimer() == null ^ this.getClearTimer() == null)
+            return false;
+        if (other.getClearTimer() != null && other.getClearTimer().equals(this.getClearTimer()) == false)
+            return false;
+        if (other.getResetTimer() == null ^ this.getResetTimer() == null)
+            return false;
+        if (other.getResetTimer() != null && other.getResetTimer().equals(this.getResetTimer()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getSetVariable() == null) ? 0 : getSetVariable().hashCode());
+        hashCode = prime * hashCode + ((getSns() == null) ? 0 : getSns().hashCode());
+        hashCode = prime * hashCode + ((getIotTopicPublish() == null) ? 0 : getIotTopicPublish().hashCode());
+        hashCode = prime * hashCode + ((getSetTimer() == null) ? 0 : getSetTimer().hashCode());
+        hashCode = prime * hashCode + ((getClearTimer() == null) ? 0 : getClearTimer().hashCode());
+        hashCode = prime * hashCode + ((getResetTimer() == null) ? 0 : getResetTimer().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Action clone() {
+        try {
+            return (Action) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.ActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Attribute.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Attribute.java
new file mode 100644
index 000000000000..79b17bffc716
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Attribute.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to
+ * the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those
+ * attributes (and their paired values) specified here are available for use in the <code>condition</code> expressions
+ * used by detectors.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/Attribute" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Attribute implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from
+     * the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events
+     * system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its
+     * paired value) specified here are available for use in the <code>condition</code> expressions used by detectors.
+     * </p>
+     * <p>
+     * Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     * </p>
+     */
+    private String jsonPath;
+
+    /**
+     * <p>
+     * An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from
+     * the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events
+     * system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its
+     * paired value) specified here are available for use in the <code>condition</code> expressions used by detectors.
+     * </p>
+     * <p>
+     * Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     * </p>
+     * 
+     * @param jsonPath
+     *        An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute
+     *        from the JSON payload that is made available by the input. Inputs are derived from messages sent to the
+     *        AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the
+     *        attribute (and its paired value) specified here are available for use in the <code>condition</code>
+     *        expressions used by detectors. </p>
+     *        <p>
+     *        Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     */
+
+    public void setJsonPath(String jsonPath) {
+        this.jsonPath = jsonPath;
+    }
+
+    /**
+     * <p>
+     * An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from
+     * the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events
+     * system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its
+     * paired value) specified here are available for use in the <code>condition</code> expressions used by detectors.
+     * </p>
+     * <p>
+     * Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     * </p>
+     * 
+     * @return An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an
+     *         attribute from the JSON payload that is made available by the input. Inputs are derived from messages
+     *         sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON
+     *         payload, and the attribute (and its paired value) specified here are available for use in the
+     *         <code>condition</code> expressions used by detectors. </p>
+     *         <p>
+     *         Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     */
+
+    public String getJsonPath() {
+        return this.jsonPath;
+    }
+
+    /**
+     * <p>
+     * An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from
+     * the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events
+     * system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its
+     * paired value) specified here are available for use in the <code>condition</code> expressions used by detectors.
+     * </p>
+     * <p>
+     * Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     * </p>
+     * 
+     * @param jsonPath
+     *        An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute
+     *        from the JSON payload that is made available by the input. Inputs are derived from messages sent to the
+     *        AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the
+     *        attribute (and its paired value) specified here are available for use in the <code>condition</code>
+     *        expressions used by detectors. </p>
+     *        <p>
+     *        Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Attribute withJsonPath(String jsonPath) {
+        setJsonPath(jsonPath);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getJsonPath() != null)
+            sb.append("JsonPath: ").append(getJsonPath());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Attribute == false)
+            return false;
+        Attribute other = (Attribute) obj;
+        if (other.getJsonPath() == null ^ this.getJsonPath() == null)
+            return false;
+        if (other.getJsonPath() != null && other.getJsonPath().equals(this.getJsonPath()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getJsonPath() == null) ? 0 : getJsonPath().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Attribute clone() {
+        try {
+            return (Attribute) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.AttributeMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ClearTimerAction.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ClearTimerAction.java
new file mode 100644
index 000000000000..f52dd8cf488f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ClearTimerAction.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information needed to clear the timer.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ClearTimerAction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ClearTimerAction implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the timer to clear.
+     * </p>
+     */
+    private String timerName;
+
+    /**
+     * <p>
+     * The name of the timer to clear.
+     * </p>
+     * 
+     * @param timerName
+     *        The name of the timer to clear.
+     */
+
+    public void setTimerName(String timerName) {
+        this.timerName = timerName;
+    }
+
+    /**
+     * <p>
+     * The name of the timer to clear.
+     * </p>
+     * 
+     * @return The name of the timer to clear.
+     */
+
+    public String getTimerName() {
+        return this.timerName;
+    }
+
+    /**
+     * <p>
+     * The name of the timer to clear.
+     * </p>
+     * 
+     * @param timerName
+     *        The name of the timer to clear.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClearTimerAction withTimerName(String timerName) {
+        setTimerName(timerName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTimerName() != null)
+            sb.append("TimerName: ").append(getTimerName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ClearTimerAction == false)
+            return false;
+        ClearTimerAction other = (ClearTimerAction) obj;
+        if (other.getTimerName() == null ^ this.getTimerName() == null)
+            return false;
+        if (other.getTimerName() != null && other.getTimerName().equals(this.getTimerName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTimerName() == null) ? 0 : getTimerName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ClearTimerAction clone() {
+        try {
+            return (ClearTimerAction) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.ClearTimerActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateDetectorModelRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateDetectorModelRequest.java
new file mode 100644
index 000000000000..20c677302ba4
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateDetectorModelRequest.java
@@ -0,0 +1,440 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateDetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CreateDetectorModelRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * Information that defines how the detectors operate.
+     * </p>
+     */
+    private DetectorModelDefinition detectorModelDefinition;
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     */
+    private String detectorModelDescription;
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     */
+    private String key;
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     */
+    private String roleArn;
+    /**
+     * <p>
+     * Metadata which can be used to manage the detector model.
+     * </p>
+     */
+    private java.util.List<Tag> tags;
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @return The name of the detector model.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information that defines how the detectors operate.
+     * </p>
+     * 
+     * @param detectorModelDefinition
+     *        Information that defines how the detectors operate.
+     */
+
+    public void setDetectorModelDefinition(DetectorModelDefinition detectorModelDefinition) {
+        this.detectorModelDefinition = detectorModelDefinition;
+    }
+
+    /**
+     * <p>
+     * Information that defines how the detectors operate.
+     * </p>
+     * 
+     * @return Information that defines how the detectors operate.
+     */
+
+    public DetectorModelDefinition getDetectorModelDefinition() {
+        return this.detectorModelDefinition;
+    }
+
+    /**
+     * <p>
+     * Information that defines how the detectors operate.
+     * </p>
+     * 
+     * @param detectorModelDefinition
+     *        Information that defines how the detectors operate.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withDetectorModelDefinition(DetectorModelDefinition detectorModelDefinition) {
+        setDetectorModelDefinition(detectorModelDefinition);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     */
+
+    public void setDetectorModelDescription(String detectorModelDescription) {
+        this.detectorModelDescription = detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @return A brief description of the detector model.
+     */
+
+    public String getDetectorModelDescription() {
+        return this.detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withDetectorModelDescription(String detectorModelDescription) {
+        setDetectorModelDescription(detectorModelDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     * 
+     * @param key
+     *        The input attribute key used to identify a device or system in order to create a detector (an instance of
+     *        the detector model) and then to route each input received to the appropriate detector (instance). This
+     *        parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each
+     *        input that is used to identify the device associated with the input.
+     */
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     * 
+     * @return The input attribute key used to identify a device or system in order to create a detector (an instance of
+     *         the detector model) and then to route each input received to the appropriate detector (instance). This
+     *         parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each
+     *         input that is used to identify the device associated with the input.
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     * 
+     * @param key
+     *        The input attribute key used to identify a device or system in order to create a detector (an instance of
+     *        the detector model) and then to route each input received to the appropriate detector (instance). This
+     *        parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each
+     *        input that is used to identify the device associated with the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withKey(String key) {
+        setKey(key);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @return The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the detector model.
+     * </p>
+     * 
+     * @return Metadata which can be used to manage the detector model.
+     */
+
+    public java.util.List<Tag> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the detector model.
+     * </p>
+     * 
+     * @param tags
+     *        Metadata which can be used to manage the detector model.
+     */
+
+    public void setTags(java.util.Collection<Tag> tags) {
+        if (tags == null) {
+            this.tags = null;
+            return;
+        }
+
+        this.tags = new java.util.ArrayList<Tag>(tags);
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the detector model.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param tags
+     *        Metadata which can be used to manage the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withTags(Tag... tags) {
+        if (this.tags == null) {
+            setTags(new java.util.ArrayList<Tag>(tags.length));
+        }
+        for (Tag ele : tags) {
+            this.tags.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the detector model.
+     * </p>
+     * 
+     * @param tags
+     *        Metadata which can be used to manage the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelRequest withTags(java.util.Collection<Tag> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getDetectorModelDefinition() != null)
+            sb.append("DetectorModelDefinition: ").append(getDetectorModelDefinition()).append(",");
+        if (getDetectorModelDescription() != null)
+            sb.append("DetectorModelDescription: ").append(getDetectorModelDescription()).append(",");
+        if (getKey() != null)
+            sb.append("Key: ").append(getKey()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CreateDetectorModelRequest == false)
+            return false;
+        CreateDetectorModelRequest other = (CreateDetectorModelRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getDetectorModelDefinition() == null ^ this.getDetectorModelDefinition() == null)
+            return false;
+        if (other.getDetectorModelDefinition() != null && other.getDetectorModelDefinition().equals(this.getDetectorModelDefinition()) == false)
+            return false;
+        if (other.getDetectorModelDescription() == null ^ this.getDetectorModelDescription() == null)
+            return false;
+        if (other.getDetectorModelDescription() != null && other.getDetectorModelDescription().equals(this.getDetectorModelDescription()) == false)
+            return false;
+        if (other.getKey() == null ^ this.getKey() == null)
+            return false;
+        if (other.getKey() != null && other.getKey().equals(this.getKey()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelDefinition() == null) ? 0 : getDetectorModelDefinition().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelDescription() == null) ? 0 : getDetectorModelDescription().hashCode());
+        hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CreateDetectorModelRequest clone() {
+        return (CreateDetectorModelRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateDetectorModelResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateDetectorModelResult.java
new file mode 100644
index 000000000000..a506ff67e6af
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateDetectorModelResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateDetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CreateDetectorModelResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     */
+    private DetectorModelConfiguration detectorModelConfiguration;
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     * 
+     * @param detectorModelConfiguration
+     *        Information about how the detector model is configured.
+     */
+
+    public void setDetectorModelConfiguration(DetectorModelConfiguration detectorModelConfiguration) {
+        this.detectorModelConfiguration = detectorModelConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     * 
+     * @return Information about how the detector model is configured.
+     */
+
+    public DetectorModelConfiguration getDetectorModelConfiguration() {
+        return this.detectorModelConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     * 
+     * @param detectorModelConfiguration
+     *        Information about how the detector model is configured.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateDetectorModelResult withDetectorModelConfiguration(DetectorModelConfiguration detectorModelConfiguration) {
+        setDetectorModelConfiguration(detectorModelConfiguration);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelConfiguration() != null)
+            sb.append("DetectorModelConfiguration: ").append(getDetectorModelConfiguration());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CreateDetectorModelResult == false)
+            return false;
+        CreateDetectorModelResult other = (CreateDetectorModelResult) obj;
+        if (other.getDetectorModelConfiguration() == null ^ this.getDetectorModelConfiguration() == null)
+            return false;
+        if (other.getDetectorModelConfiguration() != null && other.getDetectorModelConfiguration().equals(this.getDetectorModelConfiguration()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelConfiguration() == null) ? 0 : getDetectorModelConfiguration().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CreateDetectorModelResult clone() {
+        try {
+            return (CreateDetectorModelResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateInputRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateInputRequest.java
new file mode 100644
index 000000000000..a177e4e13994
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateInputRequest.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CreateInputRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name you want to give to the input.
+     * </p>
+     */
+    private String inputName;
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     */
+    private String inputDescription;
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     */
+    private InputDefinition inputDefinition;
+    /**
+     * <p>
+     * Metadata which can be used to manage the input.
+     * </p>
+     */
+    private java.util.List<Tag> tags;
+
+    /**
+     * <p>
+     * The name you want to give to the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name you want to give to the input.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name you want to give to the input.
+     * </p>
+     * 
+     * @return The name you want to give to the input.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name you want to give to the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name you want to give to the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateInputRequest withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     */
+
+    public void setInputDescription(String inputDescription) {
+        this.inputDescription = inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @return A brief description of the input.
+     */
+
+    public String getInputDescription() {
+        return this.inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateInputRequest withInputDescription(String inputDescription) {
+        setInputDescription(inputDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @param inputDefinition
+     *        The definition of the input.
+     */
+
+    public void setInputDefinition(InputDefinition inputDefinition) {
+        this.inputDefinition = inputDefinition;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @return The definition of the input.
+     */
+
+    public InputDefinition getInputDefinition() {
+        return this.inputDefinition;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @param inputDefinition
+     *        The definition of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateInputRequest withInputDefinition(InputDefinition inputDefinition) {
+        setInputDefinition(inputDefinition);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the input.
+     * </p>
+     * 
+     * @return Metadata which can be used to manage the input.
+     */
+
+    public java.util.List<Tag> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the input.
+     * </p>
+     * 
+     * @param tags
+     *        Metadata which can be used to manage the input.
+     */
+
+    public void setTags(java.util.Collection<Tag> tags) {
+        if (tags == null) {
+            this.tags = null;
+            return;
+        }
+
+        this.tags = new java.util.ArrayList<Tag>(tags);
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the input.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param tags
+     *        Metadata which can be used to manage the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateInputRequest withTags(Tag... tags) {
+        if (this.tags == null) {
+            setTags(new java.util.ArrayList<Tag>(tags.length));
+        }
+        for (Tag ele : tags) {
+            this.tags.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Metadata which can be used to manage the input.
+     * </p>
+     * 
+     * @param tags
+     *        Metadata which can be used to manage the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateInputRequest withTags(java.util.Collection<Tag> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName()).append(",");
+        if (getInputDescription() != null)
+            sb.append("InputDescription: ").append(getInputDescription()).append(",");
+        if (getInputDefinition() != null)
+            sb.append("InputDefinition: ").append(getInputDefinition()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CreateInputRequest == false)
+            return false;
+        CreateInputRequest other = (CreateInputRequest) obj;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        if (other.getInputDescription() == null ^ this.getInputDescription() == null)
+            return false;
+        if (other.getInputDescription() != null && other.getInputDescription().equals(this.getInputDescription()) == false)
+            return false;
+        if (other.getInputDefinition() == null ^ this.getInputDefinition() == null)
+            return false;
+        if (other.getInputDefinition() != null && other.getInputDefinition().equals(this.getInputDefinition()) == false)
+            return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        hashCode = prime * hashCode + ((getInputDescription() == null) ? 0 : getInputDescription().hashCode());
+        hashCode = prime * hashCode + ((getInputDefinition() == null) ? 0 : getInputDefinition().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CreateInputRequest clone() {
+        return (CreateInputRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateInputResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateInputResult.java
new file mode 100644
index 000000000000..7e5143ff8ed0
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/CreateInputResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/CreateInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CreateInputResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     */
+    private InputConfiguration inputConfiguration;
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     * 
+     * @param inputConfiguration
+     *        Information about the configuration of the input.
+     */
+
+    public void setInputConfiguration(InputConfiguration inputConfiguration) {
+        this.inputConfiguration = inputConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     * 
+     * @return Information about the configuration of the input.
+     */
+
+    public InputConfiguration getInputConfiguration() {
+        return this.inputConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     * 
+     * @param inputConfiguration
+     *        Information about the configuration of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateInputResult withInputConfiguration(InputConfiguration inputConfiguration) {
+        setInputConfiguration(inputConfiguration);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputConfiguration() != null)
+            sb.append("InputConfiguration: ").append(getInputConfiguration());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CreateInputResult == false)
+            return false;
+        CreateInputResult other = (CreateInputResult) obj;
+        if (other.getInputConfiguration() == null ^ this.getInputConfiguration() == null)
+            return false;
+        if (other.getInputConfiguration() != null && other.getInputConfiguration().equals(this.getInputConfiguration()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputConfiguration() == null) ? 0 : getInputConfiguration().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CreateInputResult clone() {
+        try {
+            return (CreateInputResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteDetectorModelRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteDetectorModelRequest.java
new file mode 100644
index 000000000000..753544d0be38
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteDetectorModelRequest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteDetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DeleteDetectorModelRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model to be deleted.
+     * </p>
+     */
+    private String detectorModelName;
+
+    /**
+     * <p>
+     * The name of the detector model to be deleted.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model to be deleted.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model to be deleted.
+     * </p>
+     * 
+     * @return The name of the detector model to be deleted.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model to be deleted.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model to be deleted.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DeleteDetectorModelRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DeleteDetectorModelRequest == false)
+            return false;
+        DeleteDetectorModelRequest other = (DeleteDetectorModelRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DeleteDetectorModelRequest clone() {
+        return (DeleteDetectorModelRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteDetectorModelResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteDetectorModelResult.java
new file mode 100644
index 000000000000..f47d9194830f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteDetectorModelResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteDetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DeleteDetectorModelResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DeleteDetectorModelResult == false)
+            return false;
+        DeleteDetectorModelResult other = (DeleteDetectorModelResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public DeleteDetectorModelResult clone() {
+        try {
+            return (DeleteDetectorModelResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteInputRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteInputRequest.java
new file mode 100644
index 000000000000..c093f600de22
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteInputRequest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DeleteInputRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the input to be deleted.
+     * </p>
+     */
+    private String inputName;
+
+    /**
+     * <p>
+     * The name of the input to be deleted.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input to be deleted.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input to be deleted.
+     * </p>
+     * 
+     * @return The name of the input to be deleted.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input to be deleted.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input to be deleted.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DeleteInputRequest withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DeleteInputRequest == false)
+            return false;
+        DeleteInputRequest other = (DeleteInputRequest) obj;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DeleteInputRequest clone() {
+        return (DeleteInputRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteInputResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteInputResult.java
new file mode 100644
index 000000000000..689858213e68
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DeleteInputResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DeleteInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DeleteInputResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DeleteInputResult == false)
+            return false;
+        DeleteInputResult other = (DeleteInputResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public DeleteInputResult clone() {
+        try {
+            return (DeleteInputResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeDetectorModelRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeDetectorModelRequest.java
new file mode 100644
index 000000000000..fb01f09b1a3e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeDetectorModelRequest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeDetectorModel" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeDetectorModelRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     */
+    private String detectorModelVersion;
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @return The name of the detector model.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeDetectorModelRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model.
+     */
+
+    public void setDetectorModelVersion(String detectorModelVersion) {
+        this.detectorModelVersion = detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     * 
+     * @return The version of the detector model.
+     */
+
+    public String getDetectorModelVersion() {
+        return this.detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeDetectorModelRequest withDetectorModelVersion(String detectorModelVersion) {
+        setDetectorModelVersion(detectorModelVersion);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getDetectorModelVersion() != null)
+            sb.append("DetectorModelVersion: ").append(getDetectorModelVersion());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeDetectorModelRequest == false)
+            return false;
+        DescribeDetectorModelRequest other = (DescribeDetectorModelRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getDetectorModelVersion() == null ^ this.getDetectorModelVersion() == null)
+            return false;
+        if (other.getDetectorModelVersion() != null && other.getDetectorModelVersion().equals(this.getDetectorModelVersion()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelVersion() == null) ? 0 : getDetectorModelVersion().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeDetectorModelRequest clone() {
+        return (DescribeDetectorModelRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeDetectorModelResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeDetectorModelResult.java
new file mode 100644
index 000000000000..df6bf2804c96
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeDetectorModelResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeDetectorModel" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeDetectorModelResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about the detector model.
+     * </p>
+     */
+    private DetectorModel detectorModel;
+
+    /**
+     * <p>
+     * Information about the detector model.
+     * </p>
+     * 
+     * @param detectorModel
+     *        Information about the detector model.
+     */
+
+    public void setDetectorModel(DetectorModel detectorModel) {
+        this.detectorModel = detectorModel;
+    }
+
+    /**
+     * <p>
+     * Information about the detector model.
+     * </p>
+     * 
+     * @return Information about the detector model.
+     */
+
+    public DetectorModel getDetectorModel() {
+        return this.detectorModel;
+    }
+
+    /**
+     * <p>
+     * Information about the detector model.
+     * </p>
+     * 
+     * @param detectorModel
+     *        Information about the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeDetectorModelResult withDetectorModel(DetectorModel detectorModel) {
+        setDetectorModel(detectorModel);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModel() != null)
+            sb.append("DetectorModel: ").append(getDetectorModel());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeDetectorModelResult == false)
+            return false;
+        DescribeDetectorModelResult other = (DescribeDetectorModelResult) obj;
+        if (other.getDetectorModel() == null ^ this.getDetectorModel() == null)
+            return false;
+        if (other.getDetectorModel() != null && other.getDetectorModel().equals(this.getDetectorModel()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModel() == null) ? 0 : getDetectorModel().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeDetectorModelResult clone() {
+        try {
+            return (DescribeDetectorModelResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeInputRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeInputRequest.java
new file mode 100644
index 000000000000..b2cd3377fca2
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeInputRequest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeInputRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     */
+    private String inputName;
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @return The name of the input.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeInputRequest withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeInputRequest == false)
+            return false;
+        DescribeInputRequest other = (DescribeInputRequest) obj;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeInputRequest clone() {
+        return (DescribeInputRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeInputResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeInputResult.java
new file mode 100644
index 000000000000..f2c9eee4cbb3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeInputResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeInputResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about the input.
+     * </p>
+     */
+    private Input input;
+
+    /**
+     * <p>
+     * Information about the input.
+     * </p>
+     * 
+     * @param input
+     *        Information about the input.
+     */
+
+    public void setInput(Input input) {
+        this.input = input;
+    }
+
+    /**
+     * <p>
+     * Information about the input.
+     * </p>
+     * 
+     * @return Information about the input.
+     */
+
+    public Input getInput() {
+        return this.input;
+    }
+
+    /**
+     * <p>
+     * Information about the input.
+     * </p>
+     * 
+     * @param input
+     *        Information about the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeInputResult withInput(Input input) {
+        setInput(input);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInput() != null)
+            sb.append("Input: ").append(getInput());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeInputResult == false)
+            return false;
+        DescribeInputResult other = (DescribeInputResult) obj;
+        if (other.getInput() == null ^ this.getInput() == null)
+            return false;
+        if (other.getInput() != null && other.getInput().equals(this.getInput()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInput() == null) ? 0 : getInput().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeInputResult clone() {
+        try {
+            return (DescribeInputResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeLoggingOptionsRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeLoggingOptionsRequest.java
new file mode 100644
index 000000000000..6f04a7dd5500
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeLoggingOptionsRequest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeLoggingOptions" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeLoggingOptionsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeLoggingOptionsRequest == false)
+            return false;
+        DescribeLoggingOptionsRequest other = (DescribeLoggingOptionsRequest) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public DescribeLoggingOptionsRequest clone() {
+        return (DescribeLoggingOptionsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeLoggingOptionsResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeLoggingOptionsResult.java
new file mode 100644
index 000000000000..679196f6faaf
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DescribeLoggingOptionsResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DescribeLoggingOptions" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeLoggingOptionsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The current settings of the AWS IoT Events logging options.
+     * </p>
+     */
+    private LoggingOptions loggingOptions;
+
+    /**
+     * <p>
+     * The current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param loggingOptions
+     *        The current settings of the AWS IoT Events logging options.
+     */
+
+    public void setLoggingOptions(LoggingOptions loggingOptions) {
+        this.loggingOptions = loggingOptions;
+    }
+
+    /**
+     * <p>
+     * The current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @return The current settings of the AWS IoT Events logging options.
+     */
+
+    public LoggingOptions getLoggingOptions() {
+        return this.loggingOptions;
+    }
+
+    /**
+     * <p>
+     * The current settings of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param loggingOptions
+     *        The current settings of the AWS IoT Events logging options.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeLoggingOptionsResult withLoggingOptions(LoggingOptions loggingOptions) {
+        setLoggingOptions(loggingOptions);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getLoggingOptions() != null)
+            sb.append("LoggingOptions: ").append(getLoggingOptions());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeLoggingOptionsResult == false)
+            return false;
+        DescribeLoggingOptionsResult other = (DescribeLoggingOptionsResult) obj;
+        if (other.getLoggingOptions() == null ^ this.getLoggingOptions() == null)
+            return false;
+        if (other.getLoggingOptions() != null && other.getLoggingOptions().equals(this.getLoggingOptions()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getLoggingOptions() == null) ? 0 : getLoggingOptions().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeLoggingOptionsResult clone() {
+        try {
+            return (DescribeLoggingOptionsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorDebugOption.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorDebugOption.java
new file mode 100644
index 000000000000..be32950dcc25
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorDebugOption.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The detector model and the specific detectors (instances) for which the logging level is given.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DetectorDebugOption" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorDebugOption implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The value of the input attribute key used to create the detector (the instance of the detector model).
+     * </p>
+     */
+    private String keyValue;
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @return The name of the detector model.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorDebugOption withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The value of the input attribute key used to create the detector (the instance of the detector model).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the input attribute key used to create the detector (the instance of the detector model).
+     */
+
+    public void setKeyValue(String keyValue) {
+        this.keyValue = keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the input attribute key used to create the detector (the instance of the detector model).
+     * </p>
+     * 
+     * @return The value of the input attribute key used to create the detector (the instance of the detector model).
+     */
+
+    public String getKeyValue() {
+        return this.keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the input attribute key used to create the detector (the instance of the detector model).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the input attribute key used to create the detector (the instance of the detector model).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorDebugOption withKeyValue(String keyValue) {
+        setKeyValue(keyValue);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getKeyValue() != null)
+            sb.append("KeyValue: ").append(getKeyValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorDebugOption == false)
+            return false;
+        DetectorDebugOption other = (DetectorDebugOption) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getKeyValue() == null ^ this.getKeyValue() == null)
+            return false;
+        if (other.getKeyValue() != null && other.getKeyValue().equals(this.getKeyValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getKeyValue() == null) ? 0 : getKeyValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorDebugOption clone() {
+        try {
+            return (DetectorDebugOption) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.DetectorDebugOptionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModel.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModel.java
new file mode 100644
index 000000000000..4bb16aff6fcd
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModel.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the detector model.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModel implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     */
+    private DetectorModelDefinition detectorModelDefinition;
+    /**
+     * <p>
+     * Information about how the detector is configured.
+     * </p>
+     */
+    private DetectorModelConfiguration detectorModelConfiguration;
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     * 
+     * @param detectorModelDefinition
+     *        Information that defines how a detector operates.
+     */
+
+    public void setDetectorModelDefinition(DetectorModelDefinition detectorModelDefinition) {
+        this.detectorModelDefinition = detectorModelDefinition;
+    }
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     * 
+     * @return Information that defines how a detector operates.
+     */
+
+    public DetectorModelDefinition getDetectorModelDefinition() {
+        return this.detectorModelDefinition;
+    }
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     * 
+     * @param detectorModelDefinition
+     *        Information that defines how a detector operates.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModel withDetectorModelDefinition(DetectorModelDefinition detectorModelDefinition) {
+        setDetectorModelDefinition(detectorModelDefinition);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector is configured.
+     * </p>
+     * 
+     * @param detectorModelConfiguration
+     *        Information about how the detector is configured.
+     */
+
+    public void setDetectorModelConfiguration(DetectorModelConfiguration detectorModelConfiguration) {
+        this.detectorModelConfiguration = detectorModelConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector is configured.
+     * </p>
+     * 
+     * @return Information about how the detector is configured.
+     */
+
+    public DetectorModelConfiguration getDetectorModelConfiguration() {
+        return this.detectorModelConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector is configured.
+     * </p>
+     * 
+     * @param detectorModelConfiguration
+     *        Information about how the detector is configured.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModel withDetectorModelConfiguration(DetectorModelConfiguration detectorModelConfiguration) {
+        setDetectorModelConfiguration(detectorModelConfiguration);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelDefinition() != null)
+            sb.append("DetectorModelDefinition: ").append(getDetectorModelDefinition()).append(",");
+        if (getDetectorModelConfiguration() != null)
+            sb.append("DetectorModelConfiguration: ").append(getDetectorModelConfiguration());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorModel == false)
+            return false;
+        DetectorModel other = (DetectorModel) obj;
+        if (other.getDetectorModelDefinition() == null ^ this.getDetectorModelDefinition() == null)
+            return false;
+        if (other.getDetectorModelDefinition() != null && other.getDetectorModelDefinition().equals(this.getDetectorModelDefinition()) == false)
+            return false;
+        if (other.getDetectorModelConfiguration() == null ^ this.getDetectorModelConfiguration() == null)
+            return false;
+        if (other.getDetectorModelConfiguration() != null && other.getDetectorModelConfiguration().equals(this.getDetectorModelConfiguration()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelDefinition() == null) ? 0 : getDetectorModelDefinition().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelConfiguration() == null) ? 0 : getDetectorModelConfiguration().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorModel clone() {
+        try {
+            return (DetectorModel) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.DetectorModelMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelConfiguration.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelConfiguration.java
new file mode 100644
index 000000000000..4a646efb76f4
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelConfiguration.java
@@ -0,0 +1,600 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about how the detector model is configured.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DetectorModelConfiguration"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelConfiguration implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     */
+    private String detectorModelVersion;
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     */
+    private String detectorModelDescription;
+    /**
+     * <p>
+     * The ARN of the detector model.
+     * </p>
+     */
+    private String detectorModelArn;
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     */
+    private String roleArn;
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The time the detector model was last updated.
+     * </p>
+     */
+    private java.util.Date lastUpdateTime;
+    /**
+     * <p>
+     * The status of the detector model.
+     * </p>
+     */
+    private String status;
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     */
+    private String key;
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @return The name of the detector model.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model.
+     */
+
+    public void setDetectorModelVersion(String detectorModelVersion) {
+        this.detectorModelVersion = detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     * 
+     * @return The version of the detector model.
+     */
+
+    public String getDetectorModelVersion() {
+        return this.detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model.
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withDetectorModelVersion(String detectorModelVersion) {
+        setDetectorModelVersion(detectorModelVersion);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     */
+
+    public void setDetectorModelDescription(String detectorModelDescription) {
+        this.detectorModelDescription = detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @return A brief description of the detector model.
+     */
+
+    public String getDetectorModelDescription() {
+        return this.detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withDetectorModelDescription(String detectorModelDescription) {
+        setDetectorModelDescription(detectorModelDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the detector model.
+     * </p>
+     * 
+     * @param detectorModelArn
+     *        The ARN of the detector model.
+     */
+
+    public void setDetectorModelArn(String detectorModelArn) {
+        this.detectorModelArn = detectorModelArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the detector model.
+     * </p>
+     * 
+     * @return The ARN of the detector model.
+     */
+
+    public String getDetectorModelArn() {
+        return this.detectorModelArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the detector model.
+     * </p>
+     * 
+     * @param detectorModelArn
+     *        The ARN of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withDetectorModelArn(String detectorModelArn) {
+        setDetectorModelArn(detectorModelArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @return The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector model was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     * 
+     * @return The time the detector model was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector model was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was last updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The time the detector model was last updated.
+     */
+
+    public void setLastUpdateTime(java.util.Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was last updated.
+     * </p>
+     * 
+     * @return The time the detector model was last updated.
+     */
+
+    public java.util.Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was last updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The time the detector model was last updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withLastUpdateTime(java.util.Date lastUpdateTime) {
+        setLastUpdateTime(lastUpdateTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model.
+     * </p>
+     * 
+     * @param status
+     *        The status of the detector model.
+     * @see DetectorModelVersionStatus
+     */
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model.
+     * </p>
+     * 
+     * @return The status of the detector model.
+     * @see DetectorModelVersionStatus
+     */
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model.
+     * </p>
+     * 
+     * @param status
+     *        The status of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see DetectorModelVersionStatus
+     */
+
+    public DetectorModelConfiguration withStatus(String status) {
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model.
+     * </p>
+     * 
+     * @param status
+     *        The status of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see DetectorModelVersionStatus
+     */
+
+    public DetectorModelConfiguration withStatus(DetectorModelVersionStatus status) {
+        this.status = status.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     * 
+     * @param key
+     *        The input attribute key used to identify a device or system in order to create a detector (an instance of
+     *        the detector model) and then to route each input received to the appropriate detector (instance). This
+     *        parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each
+     *        input that is used to identify the device associated with the input.
+     */
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     * 
+     * @return The input attribute key used to identify a device or system in order to create a detector (an instance of
+     *         the detector model) and then to route each input received to the appropriate detector (instance). This
+     *         parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each
+     *         input that is used to identify the device associated with the input.
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     * <p>
+     * The input attribute key used to identify a device or system in order to create a detector (an instance of the
+     * detector model) and then to route each input received to the appropriate detector (instance). This parameter uses
+     * a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to
+     * identify the device associated with the input.
+     * </p>
+     * 
+     * @param key
+     *        The input attribute key used to identify a device or system in order to create a detector (an instance of
+     *        the detector model) and then to route each input received to the appropriate detector (instance). This
+     *        parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each
+     *        input that is used to identify the device associated with the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelConfiguration withKey(String key) {
+        setKey(key);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getDetectorModelVersion() != null)
+            sb.append("DetectorModelVersion: ").append(getDetectorModelVersion()).append(",");
+        if (getDetectorModelDescription() != null)
+            sb.append("DetectorModelDescription: ").append(getDetectorModelDescription()).append(",");
+        if (getDetectorModelArn() != null)
+            sb.append("DetectorModelArn: ").append(getDetectorModelArn()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getLastUpdateTime() != null)
+            sb.append("LastUpdateTime: ").append(getLastUpdateTime()).append(",");
+        if (getStatus() != null)
+            sb.append("Status: ").append(getStatus()).append(",");
+        if (getKey() != null)
+            sb.append("Key: ").append(getKey());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorModelConfiguration == false)
+            return false;
+        DetectorModelConfiguration other = (DetectorModelConfiguration) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getDetectorModelVersion() == null ^ this.getDetectorModelVersion() == null)
+            return false;
+        if (other.getDetectorModelVersion() != null && other.getDetectorModelVersion().equals(this.getDetectorModelVersion()) == false)
+            return false;
+        if (other.getDetectorModelDescription() == null ^ this.getDetectorModelDescription() == null)
+            return false;
+        if (other.getDetectorModelDescription() != null && other.getDetectorModelDescription().equals(this.getDetectorModelDescription()) == false)
+            return false;
+        if (other.getDetectorModelArn() == null ^ this.getDetectorModelArn() == null)
+            return false;
+        if (other.getDetectorModelArn() != null && other.getDetectorModelArn().equals(this.getDetectorModelArn()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getLastUpdateTime() == null ^ this.getLastUpdateTime() == null)
+            return false;
+        if (other.getLastUpdateTime() != null && other.getLastUpdateTime().equals(this.getLastUpdateTime()) == false)
+            return false;
+        if (other.getStatus() == null ^ this.getStatus() == null)
+            return false;
+        if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
+            return false;
+        if (other.getKey() == null ^ this.getKey() == null)
+            return false;
+        if (other.getKey() != null && other.getKey().equals(this.getKey()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelVersion() == null) ? 0 : getDetectorModelVersion().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelDescription() == null) ? 0 : getDetectorModelDescription().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelArn() == null) ? 0 : getDetectorModelArn().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
+        hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorModelConfiguration clone() {
+        try {
+            return (DetectorModelConfiguration) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.DetectorModelConfigurationMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelDefinition.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelDefinition.java
new file mode 100644
index 000000000000..c3a632e10af0
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelDefinition.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information that defines how a detector operates.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DetectorModelDefinition" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelDefinition implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Information about the states of the detector.
+     * </p>
+     */
+    private java.util.List<State> states;
+    /**
+     * <p>
+     * The state that is entered at the creation of each detector (instance).
+     * </p>
+     */
+    private String initialStateName;
+
+    /**
+     * <p>
+     * Information about the states of the detector.
+     * </p>
+     * 
+     * @return Information about the states of the detector.
+     */
+
+    public java.util.List<State> getStates() {
+        return states;
+    }
+
+    /**
+     * <p>
+     * Information about the states of the detector.
+     * </p>
+     * 
+     * @param states
+     *        Information about the states of the detector.
+     */
+
+    public void setStates(java.util.Collection<State> states) {
+        if (states == null) {
+            this.states = null;
+            return;
+        }
+
+        this.states = new java.util.ArrayList<State>(states);
+    }
+
+    /**
+     * <p>
+     * Information about the states of the detector.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setStates(java.util.Collection)} or {@link #withStates(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param states
+     *        Information about the states of the detector.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelDefinition withStates(State... states) {
+        if (this.states == null) {
+            setStates(new java.util.ArrayList<State>(states.length));
+        }
+        for (State ele : states) {
+            this.states.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information about the states of the detector.
+     * </p>
+     * 
+     * @param states
+     *        Information about the states of the detector.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelDefinition withStates(java.util.Collection<State> states) {
+        setStates(states);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The state that is entered at the creation of each detector (instance).
+     * </p>
+     * 
+     * @param initialStateName
+     *        The state that is entered at the creation of each detector (instance).
+     */
+
+    public void setInitialStateName(String initialStateName) {
+        this.initialStateName = initialStateName;
+    }
+
+    /**
+     * <p>
+     * The state that is entered at the creation of each detector (instance).
+     * </p>
+     * 
+     * @return The state that is entered at the creation of each detector (instance).
+     */
+
+    public String getInitialStateName() {
+        return this.initialStateName;
+    }
+
+    /**
+     * <p>
+     * The state that is entered at the creation of each detector (instance).
+     * </p>
+     * 
+     * @param initialStateName
+     *        The state that is entered at the creation of each detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelDefinition withInitialStateName(String initialStateName) {
+        setInitialStateName(initialStateName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getStates() != null)
+            sb.append("States: ").append(getStates()).append(",");
+        if (getInitialStateName() != null)
+            sb.append("InitialStateName: ").append(getInitialStateName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorModelDefinition == false)
+            return false;
+        DetectorModelDefinition other = (DetectorModelDefinition) obj;
+        if (other.getStates() == null ^ this.getStates() == null)
+            return false;
+        if (other.getStates() != null && other.getStates().equals(this.getStates()) == false)
+            return false;
+        if (other.getInitialStateName() == null ^ this.getInitialStateName() == null)
+            return false;
+        if (other.getInitialStateName() != null && other.getInitialStateName().equals(this.getInitialStateName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getStates() == null) ? 0 : getStates().hashCode());
+        hashCode = prime * hashCode + ((getInitialStateName() == null) ? 0 : getInitialStateName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorModelDefinition clone() {
+        try {
+            return (DetectorModelDefinition) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.DetectorModelDefinitionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelSummary.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelSummary.java
new file mode 100644
index 000000000000..cc84ee4a52fc
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelSummary.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the detector model.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DetectorModelSummary" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     */
+    private String detectorModelDescription;
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @return The name of the detector model.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelSummary withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     */
+
+    public void setDetectorModelDescription(String detectorModelDescription) {
+        this.detectorModelDescription = detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @return A brief description of the detector model.
+     */
+
+    public String getDetectorModelDescription() {
+        return this.detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelSummary withDetectorModelDescription(String detectorModelDescription) {
+        setDetectorModelDescription(detectorModelDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector model was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     * 
+     * @return The time the detector model was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector model was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelSummary withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getDetectorModelDescription() != null)
+            sb.append("DetectorModelDescription: ").append(getDetectorModelDescription()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorModelSummary == false)
+            return false;
+        DetectorModelSummary other = (DetectorModelSummary) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getDetectorModelDescription() == null ^ this.getDetectorModelDescription() == null)
+            return false;
+        if (other.getDetectorModelDescription() != null && other.getDetectorModelDescription().equals(this.getDetectorModelDescription()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelDescription() == null) ? 0 : getDetectorModelDescription().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorModelSummary clone() {
+        try {
+            return (DetectorModelSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.DetectorModelSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelVersionStatus.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelVersionStatus.java
new file mode 100644
index 000000000000..1b3bb11d59fa
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelVersionStatus.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum DetectorModelVersionStatus {
+
+    ACTIVE("ACTIVE"),
+    ACTIVATING("ACTIVATING"),
+    INACTIVE("INACTIVE"),
+    DEPRECATED("DEPRECATED"),
+    DRAFT("DRAFT"),
+    PAUSED("PAUSED"),
+    FAILED("FAILED");
+
+    private String value;
+
+    private DetectorModelVersionStatus(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return DetectorModelVersionStatus corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static DetectorModelVersionStatus fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (DetectorModelVersionStatus enumEntry : DetectorModelVersionStatus.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelVersionSummary.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelVersionSummary.java
new file mode 100644
index 000000000000..225340076166
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/DetectorModelVersionSummary.java
@@ -0,0 +1,473 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the detector model version.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/DetectorModelVersionSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelVersionSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The ID of the detector model version.
+     * </p>
+     */
+    private String detectorModelVersion;
+    /**
+     * <p>
+     * The ARN of the detector model version.
+     * </p>
+     */
+    private String detectorModelArn;
+    /**
+     * <p>
+     * The ARN of the role that grants the detector model permission to perform its tasks.
+     * </p>
+     */
+    private String roleArn;
+    /**
+     * <p>
+     * The time the detector model version was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The last time the detector model version was updated.
+     * </p>
+     */
+    private java.util.Date lastUpdateTime;
+    /**
+     * <p>
+     * The status of the detector model version.
+     * </p>
+     */
+    private String status;
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @return The name of the detector model.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelVersionSummary withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ID of the detector model version.
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The ID of the detector model version.
+     */
+
+    public void setDetectorModelVersion(String detectorModelVersion) {
+        this.detectorModelVersion = detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The ID of the detector model version.
+     * </p>
+     * 
+     * @return The ID of the detector model version.
+     */
+
+    public String getDetectorModelVersion() {
+        return this.detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The ID of the detector model version.
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The ID of the detector model version.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelVersionSummary withDetectorModelVersion(String detectorModelVersion) {
+        setDetectorModelVersion(detectorModelVersion);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the detector model version.
+     * </p>
+     * 
+     * @param detectorModelArn
+     *        The ARN of the detector model version.
+     */
+
+    public void setDetectorModelArn(String detectorModelArn) {
+        this.detectorModelArn = detectorModelArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the detector model version.
+     * </p>
+     * 
+     * @return The ARN of the detector model version.
+     */
+
+    public String getDetectorModelArn() {
+        return this.detectorModelArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the detector model version.
+     * </p>
+     * 
+     * @param detectorModelArn
+     *        The ARN of the detector model version.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelVersionSummary withDetectorModelArn(String detectorModelArn) {
+        setDetectorModelArn(detectorModelArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants the detector model permission to perform its tasks.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants the detector model permission to perform its tasks.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants the detector model permission to perform its tasks.
+     * </p>
+     * 
+     * @return The ARN of the role that grants the detector model permission to perform its tasks.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants the detector model permission to perform its tasks.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants the detector model permission to perform its tasks.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelVersionSummary withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector model version was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector model version was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model version was created.
+     * </p>
+     * 
+     * @return The time the detector model version was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector model version was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector model version was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelVersionSummary withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The last time the detector model version was updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The last time the detector model version was updated.
+     */
+
+    public void setLastUpdateTime(java.util.Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The last time the detector model version was updated.
+     * </p>
+     * 
+     * @return The last time the detector model version was updated.
+     */
+
+    public java.util.Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The last time the detector model version was updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The last time the detector model version was updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorModelVersionSummary withLastUpdateTime(java.util.Date lastUpdateTime) {
+        setLastUpdateTime(lastUpdateTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model version.
+     * </p>
+     * 
+     * @param status
+     *        The status of the detector model version.
+     * @see DetectorModelVersionStatus
+     */
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model version.
+     * </p>
+     * 
+     * @return The status of the detector model version.
+     * @see DetectorModelVersionStatus
+     */
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model version.
+     * </p>
+     * 
+     * @param status
+     *        The status of the detector model version.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see DetectorModelVersionStatus
+     */
+
+    public DetectorModelVersionSummary withStatus(String status) {
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the detector model version.
+     * </p>
+     * 
+     * @param status
+     *        The status of the detector model version.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see DetectorModelVersionStatus
+     */
+
+    public DetectorModelVersionSummary withStatus(DetectorModelVersionStatus status) {
+        this.status = status.toString();
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getDetectorModelVersion() != null)
+            sb.append("DetectorModelVersion: ").append(getDetectorModelVersion()).append(",");
+        if (getDetectorModelArn() != null)
+            sb.append("DetectorModelArn: ").append(getDetectorModelArn()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getLastUpdateTime() != null)
+            sb.append("LastUpdateTime: ").append(getLastUpdateTime()).append(",");
+        if (getStatus() != null)
+            sb.append("Status: ").append(getStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorModelVersionSummary == false)
+            return false;
+        DetectorModelVersionSummary other = (DetectorModelVersionSummary) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getDetectorModelVersion() == null ^ this.getDetectorModelVersion() == null)
+            return false;
+        if (other.getDetectorModelVersion() != null && other.getDetectorModelVersion().equals(this.getDetectorModelVersion()) == false)
+            return false;
+        if (other.getDetectorModelArn() == null ^ this.getDetectorModelArn() == null)
+            return false;
+        if (other.getDetectorModelArn() != null && other.getDetectorModelArn().equals(this.getDetectorModelArn()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getLastUpdateTime() == null ^ this.getLastUpdateTime() == null)
+            return false;
+        if (other.getLastUpdateTime() != null && other.getLastUpdateTime().equals(this.getLastUpdateTime()) == false)
+            return false;
+        if (other.getStatus() == null ^ this.getStatus() == null)
+            return false;
+        if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelVersion() == null) ? 0 : getDetectorModelVersion().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelArn() == null) ? 0 : getDetectorModelArn().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
+        hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorModelVersionSummary clone() {
+        try {
+            return (DetectorModelVersionSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.DetectorModelVersionSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Event.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Event.java
new file mode 100644
index 000000000000..d974a79d2a2b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Event.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Specifies the <code>actions</code> to be performed when the <code>condition</code> evaluates to TRUE.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/Event" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Event implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the event.
+     * </p>
+     */
+    private String eventName;
+    /**
+     * <p>
+     * [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present,
+     * the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed
+     * (=FALSE).
+     * </p>
+     */
+    private String condition;
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     */
+    private java.util.List<Action> actions;
+
+    /**
+     * <p>
+     * The name of the event.
+     * </p>
+     * 
+     * @param eventName
+     *        The name of the event.
+     */
+
+    public void setEventName(String eventName) {
+        this.eventName = eventName;
+    }
+
+    /**
+     * <p>
+     * The name of the event.
+     * </p>
+     * 
+     * @return The name of the event.
+     */
+
+    public String getEventName() {
+        return this.eventName;
+    }
+
+    /**
+     * <p>
+     * The name of the event.
+     * </p>
+     * 
+     * @param eventName
+     *        The name of the event.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Event withEventName(String eventName) {
+        setEventName(eventName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present,
+     * the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed
+     * (=FALSE).
+     * </p>
+     * 
+     * @param condition
+     *        [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not
+     *        present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions
+     *        are NOT performed (=FALSE).
+     */
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
+
+    /**
+     * <p>
+     * [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present,
+     * the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed
+     * (=FALSE).
+     * </p>
+     * 
+     * @return [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not
+     *         present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions
+     *         are NOT performed (=FALSE).
+     */
+
+    public String getCondition() {
+        return this.condition;
+    }
+
+    /**
+     * <p>
+     * [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present,
+     * the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed
+     * (=FALSE).
+     * </p>
+     * 
+     * @param condition
+     *        [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not
+     *        present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions
+     *        are NOT performed (=FALSE).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Event withCondition(String condition) {
+        setCondition(condition);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * 
+     * @return The actions to be performed.
+     */
+
+    public java.util.List<Action> getActions() {
+        return actions;
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * 
+     * @param actions
+     *        The actions to be performed.
+     */
+
+    public void setActions(java.util.Collection<Action> actions) {
+        if (actions == null) {
+            this.actions = null;
+            return;
+        }
+
+        this.actions = new java.util.ArrayList<Action>(actions);
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setActions(java.util.Collection)} or {@link #withActions(java.util.Collection)} if you want to override
+     * the existing values.
+     * </p>
+     * 
+     * @param actions
+     *        The actions to be performed.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Event withActions(Action... actions) {
+        if (this.actions == null) {
+            setActions(new java.util.ArrayList<Action>(actions.length));
+        }
+        for (Action ele : actions) {
+            this.actions.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * 
+     * @param actions
+     *        The actions to be performed.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Event withActions(java.util.Collection<Action> actions) {
+        setActions(actions);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getEventName() != null)
+            sb.append("EventName: ").append(getEventName()).append(",");
+        if (getCondition() != null)
+            sb.append("Condition: ").append(getCondition()).append(",");
+        if (getActions() != null)
+            sb.append("Actions: ").append(getActions());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Event == false)
+            return false;
+        Event other = (Event) obj;
+        if (other.getEventName() == null ^ this.getEventName() == null)
+            return false;
+        if (other.getEventName() != null && other.getEventName().equals(this.getEventName()) == false)
+            return false;
+        if (other.getCondition() == null ^ this.getCondition() == null)
+            return false;
+        if (other.getCondition() != null && other.getCondition().equals(this.getCondition()) == false)
+            return false;
+        if (other.getActions() == null ^ this.getActions() == null)
+            return false;
+        if (other.getActions() != null && other.getActions().equals(this.getActions()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getEventName() == null) ? 0 : getEventName().hashCode());
+        hashCode = prime * hashCode + ((getCondition() == null) ? 0 : getCondition().hashCode());
+        hashCode = prime * hashCode + ((getActions() == null) ? 0 : getActions().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Event clone() {
+        try {
+            return (Event) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.EventMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Input.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Input.java
new file mode 100644
index 000000000000..3b2de0f09e34
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Input.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the input.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/Input" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Input implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Information about the configuration of an input.
+     * </p>
+     */
+    private InputConfiguration inputConfiguration;
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     */
+    private InputDefinition inputDefinition;
+
+    /**
+     * <p>
+     * Information about the configuration of an input.
+     * </p>
+     * 
+     * @param inputConfiguration
+     *        Information about the configuration of an input.
+     */
+
+    public void setInputConfiguration(InputConfiguration inputConfiguration) {
+        this.inputConfiguration = inputConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about the configuration of an input.
+     * </p>
+     * 
+     * @return Information about the configuration of an input.
+     */
+
+    public InputConfiguration getInputConfiguration() {
+        return this.inputConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about the configuration of an input.
+     * </p>
+     * 
+     * @param inputConfiguration
+     *        Information about the configuration of an input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Input withInputConfiguration(InputConfiguration inputConfiguration) {
+        setInputConfiguration(inputConfiguration);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @param inputDefinition
+     *        The definition of the input.
+     */
+
+    public void setInputDefinition(InputDefinition inputDefinition) {
+        this.inputDefinition = inputDefinition;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @return The definition of the input.
+     */
+
+    public InputDefinition getInputDefinition() {
+        return this.inputDefinition;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @param inputDefinition
+     *        The definition of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Input withInputDefinition(InputDefinition inputDefinition) {
+        setInputDefinition(inputDefinition);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputConfiguration() != null)
+            sb.append("InputConfiguration: ").append(getInputConfiguration()).append(",");
+        if (getInputDefinition() != null)
+            sb.append("InputDefinition: ").append(getInputDefinition());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Input == false)
+            return false;
+        Input other = (Input) obj;
+        if (other.getInputConfiguration() == null ^ this.getInputConfiguration() == null)
+            return false;
+        if (other.getInputConfiguration() != null && other.getInputConfiguration().equals(this.getInputConfiguration()) == false)
+            return false;
+        if (other.getInputDefinition() == null ^ this.getInputDefinition() == null)
+            return false;
+        if (other.getInputDefinition() != null && other.getInputDefinition().equals(this.getInputDefinition()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputConfiguration() == null) ? 0 : getInputConfiguration().hashCode());
+        hashCode = prime * hashCode + ((getInputDefinition() == null) ? 0 : getInputDefinition().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Input clone() {
+        try {
+            return (Input) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.InputMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputConfiguration.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputConfiguration.java
new file mode 100644
index 000000000000..0406b01ccfd5
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputConfiguration.java
@@ -0,0 +1,420 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the configuration of an input.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/InputConfiguration" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputConfiguration implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     */
+    private String inputName;
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     */
+    private String inputDescription;
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     */
+    private String inputArn;
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     */
+    private java.util.Date lastUpdateTime;
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     */
+    private String status;
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @return The name of the input.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputConfiguration withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     */
+
+    public void setInputDescription(String inputDescription) {
+        this.inputDescription = inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @return A brief description of the input.
+     */
+
+    public String getInputDescription() {
+        return this.inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputConfiguration withInputDescription(String inputDescription) {
+        setInputDescription(inputDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     * 
+     * @param inputArn
+     *        The ARN of the input.
+     */
+
+    public void setInputArn(String inputArn) {
+        this.inputArn = inputArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     * 
+     * @return The ARN of the input.
+     */
+
+    public String getInputArn() {
+        return this.inputArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     * 
+     * @param inputArn
+     *        The ARN of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputConfiguration withInputArn(String inputArn) {
+        setInputArn(inputArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the input was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     * 
+     * @return The time the input was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the input was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputConfiguration withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The last time the input was updated.
+     */
+
+    public void setLastUpdateTime(java.util.Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     * 
+     * @return The last time the input was updated.
+     */
+
+    public java.util.Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The last time the input was updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputConfiguration withLastUpdateTime(java.util.Date lastUpdateTime) {
+        setLastUpdateTime(lastUpdateTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @param status
+     *        The status of the input.
+     * @see InputStatus
+     */
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @return The status of the input.
+     * @see InputStatus
+     */
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @param status
+     *        The status of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see InputStatus
+     */
+
+    public InputConfiguration withStatus(String status) {
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @param status
+     *        The status of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see InputStatus
+     */
+
+    public InputConfiguration withStatus(InputStatus status) {
+        this.status = status.toString();
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName()).append(",");
+        if (getInputDescription() != null)
+            sb.append("InputDescription: ").append(getInputDescription()).append(",");
+        if (getInputArn() != null)
+            sb.append("InputArn: ").append(getInputArn()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getLastUpdateTime() != null)
+            sb.append("LastUpdateTime: ").append(getLastUpdateTime()).append(",");
+        if (getStatus() != null)
+            sb.append("Status: ").append(getStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof InputConfiguration == false)
+            return false;
+        InputConfiguration other = (InputConfiguration) obj;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        if (other.getInputDescription() == null ^ this.getInputDescription() == null)
+            return false;
+        if (other.getInputDescription() != null && other.getInputDescription().equals(this.getInputDescription()) == false)
+            return false;
+        if (other.getInputArn() == null ^ this.getInputArn() == null)
+            return false;
+        if (other.getInputArn() != null && other.getInputArn().equals(this.getInputArn()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getLastUpdateTime() == null ^ this.getLastUpdateTime() == null)
+            return false;
+        if (other.getLastUpdateTime() != null && other.getLastUpdateTime().equals(this.getLastUpdateTime()) == false)
+            return false;
+        if (other.getStatus() == null ^ this.getStatus() == null)
+            return false;
+        if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        hashCode = prime * hashCode + ((getInputDescription() == null) ? 0 : getInputDescription().hashCode());
+        hashCode = prime * hashCode + ((getInputArn() == null) ? 0 : getInputArn().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
+        hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public InputConfiguration clone() {
+        try {
+            return (InputConfiguration) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.InputConfigurationMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputDefinition.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputDefinition.java
new file mode 100644
index 000000000000..c8349b018901
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputDefinition.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The definition of the input.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/InputDefinition" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputDefinition implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent
+     * to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and
+     * those attributes (and their paired values) specified here is available for use in the <code>condition</code>
+     * expressions used by detectors that monitor this input.
+     * </p>
+     */
+    private java.util.List<Attribute> attributes;
+
+    /**
+     * <p>
+     * The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent
+     * to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and
+     * those attributes (and their paired values) specified here is available for use in the <code>condition</code>
+     * expressions used by detectors that monitor this input.
+     * </p>
+     * 
+     * @return The attributes from the JSON payload that are made available by the input. Inputs are derived from
+     *         messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains
+     *         a JSON payload, and those attributes (and their paired values) specified here is available for use in the
+     *         <code>condition</code> expressions used by detectors that monitor this input.
+     */
+
+    public java.util.List<Attribute> getAttributes() {
+        return attributes;
+    }
+
+    /**
+     * <p>
+     * The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent
+     * to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and
+     * those attributes (and their paired values) specified here is available for use in the <code>condition</code>
+     * expressions used by detectors that monitor this input.
+     * </p>
+     * 
+     * @param attributes
+     *        The attributes from the JSON payload that are made available by the input. Inputs are derived from
+     *        messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains
+     *        a JSON payload, and those attributes (and their paired values) specified here is available for use in the
+     *        <code>condition</code> expressions used by detectors that monitor this input.
+     */
+
+    public void setAttributes(java.util.Collection<Attribute> attributes) {
+        if (attributes == null) {
+            this.attributes = null;
+            return;
+        }
+
+        this.attributes = new java.util.ArrayList<Attribute>(attributes);
+    }
+
+    /**
+     * <p>
+     * The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent
+     * to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and
+     * those attributes (and their paired values) specified here is available for use in the <code>condition</code>
+     * expressions used by detectors that monitor this input.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param attributes
+     *        The attributes from the JSON payload that are made available by the input. Inputs are derived from
+     *        messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains
+     *        a JSON payload, and those attributes (and their paired values) specified here is available for use in the
+     *        <code>condition</code> expressions used by detectors that monitor this input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputDefinition withAttributes(Attribute... attributes) {
+        if (this.attributes == null) {
+            setAttributes(new java.util.ArrayList<Attribute>(attributes.length));
+        }
+        for (Attribute ele : attributes) {
+            this.attributes.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent
+     * to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and
+     * those attributes (and their paired values) specified here is available for use in the <code>condition</code>
+     * expressions used by detectors that monitor this input.
+     * </p>
+     * 
+     * @param attributes
+     *        The attributes from the JSON payload that are made available by the input. Inputs are derived from
+     *        messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains
+     *        a JSON payload, and those attributes (and their paired values) specified here is available for use in the
+     *        <code>condition</code> expressions used by detectors that monitor this input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputDefinition withAttributes(java.util.Collection<Attribute> attributes) {
+        setAttributes(attributes);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getAttributes() != null)
+            sb.append("Attributes: ").append(getAttributes());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof InputDefinition == false)
+            return false;
+        InputDefinition other = (InputDefinition) obj;
+        if (other.getAttributes() == null ^ this.getAttributes() == null)
+            return false;
+        if (other.getAttributes() != null && other.getAttributes().equals(this.getAttributes()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getAttributes() == null) ? 0 : getAttributes().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public InputDefinition clone() {
+        try {
+            return (InputDefinition) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.InputDefinitionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputStatus.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputStatus.java
new file mode 100644
index 000000000000..e1131547ab2a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputStatus.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum InputStatus {
+
+    CREATING("CREATING"),
+    UPDATING("UPDATING"),
+    ACTIVE("ACTIVE"),
+    DELETING("DELETING");
+
+    private String value;
+
+    private InputStatus(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return InputStatus corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static InputStatus fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (InputStatus enumEntry : InputStatus.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputSummary.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputSummary.java
new file mode 100644
index 000000000000..bf9b3305c78e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InputSummary.java
@@ -0,0 +1,420 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the input.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/InputSummary" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     */
+    private String inputName;
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     */
+    private String inputDescription;
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     */
+    private String inputArn;
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     */
+    private java.util.Date lastUpdateTime;
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     */
+    private String status;
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @return The name of the input.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputSummary withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     */
+
+    public void setInputDescription(String inputDescription) {
+        this.inputDescription = inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @return A brief description of the input.
+     */
+
+    public String getInputDescription() {
+        return this.inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputSummary withInputDescription(String inputDescription) {
+        setInputDescription(inputDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     * 
+     * @param inputArn
+     *        The ARN of the input.
+     */
+
+    public void setInputArn(String inputArn) {
+        this.inputArn = inputArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     * 
+     * @return The ARN of the input.
+     */
+
+    public String getInputArn() {
+        return this.inputArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the input.
+     * </p>
+     * 
+     * @param inputArn
+     *        The ARN of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputSummary withInputArn(String inputArn) {
+        setInputArn(inputArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the input was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     * 
+     * @return The time the input was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the input was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the input was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputSummary withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The last time the input was updated.
+     */
+
+    public void setLastUpdateTime(java.util.Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     * 
+     * @return The last time the input was updated.
+     */
+
+    public java.util.Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The last time the input was updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The last time the input was updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public InputSummary withLastUpdateTime(java.util.Date lastUpdateTime) {
+        setLastUpdateTime(lastUpdateTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @param status
+     *        The status of the input.
+     * @see InputStatus
+     */
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @return The status of the input.
+     * @see InputStatus
+     */
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @param status
+     *        The status of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see InputStatus
+     */
+
+    public InputSummary withStatus(String status) {
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the input.
+     * </p>
+     * 
+     * @param status
+     *        The status of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see InputStatus
+     */
+
+    public InputSummary withStatus(InputStatus status) {
+        this.status = status.toString();
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName()).append(",");
+        if (getInputDescription() != null)
+            sb.append("InputDescription: ").append(getInputDescription()).append(",");
+        if (getInputArn() != null)
+            sb.append("InputArn: ").append(getInputArn()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getLastUpdateTime() != null)
+            sb.append("LastUpdateTime: ").append(getLastUpdateTime()).append(",");
+        if (getStatus() != null)
+            sb.append("Status: ").append(getStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof InputSummary == false)
+            return false;
+        InputSummary other = (InputSummary) obj;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        if (other.getInputDescription() == null ^ this.getInputDescription() == null)
+            return false;
+        if (other.getInputDescription() != null && other.getInputDescription().equals(this.getInputDescription()) == false)
+            return false;
+        if (other.getInputArn() == null ^ this.getInputArn() == null)
+            return false;
+        if (other.getInputArn() != null && other.getInputArn().equals(this.getInputArn()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getLastUpdateTime() == null ^ this.getLastUpdateTime() == null)
+            return false;
+        if (other.getLastUpdateTime() != null && other.getLastUpdateTime().equals(this.getLastUpdateTime()) == false)
+            return false;
+        if (other.getStatus() == null ^ this.getStatus() == null)
+            return false;
+        if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        hashCode = prime * hashCode + ((getInputDescription() == null) ? 0 : getInputDescription().hashCode());
+        hashCode = prime * hashCode + ((getInputArn() == null) ? 0 : getInputArn().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
+        hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public InputSummary clone() {
+        try {
+            return (InputSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.InputSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InternalFailureException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InternalFailureException.java
new file mode 100644
index 000000000000..0a1106448d3a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InternalFailureException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * An internal failure occurred.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InternalFailureException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InternalFailureException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InternalFailureException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InvalidRequestException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InvalidRequestException.java
new file mode 100644
index 000000000000..efaae5afc435
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/InvalidRequestException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The request was invalid.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InvalidRequestException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InvalidRequestException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InvalidRequestException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/IotTopicPublishAction.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/IotTopicPublishAction.java
new file mode 100644
index 000000000000..f038077b846f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/IotTopicPublishAction.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information required to publish the MQTT message via the AWS IoT Message Broker.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/IotTopicPublishAction" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class IotTopicPublishAction implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The MQTT topic of the message.
+     * </p>
+     */
+    private String mqttTopic;
+
+    /**
+     * <p>
+     * The MQTT topic of the message.
+     * </p>
+     * 
+     * @param mqttTopic
+     *        The MQTT topic of the message.
+     */
+
+    public void setMqttTopic(String mqttTopic) {
+        this.mqttTopic = mqttTopic;
+    }
+
+    /**
+     * <p>
+     * The MQTT topic of the message.
+     * </p>
+     * 
+     * @return The MQTT topic of the message.
+     */
+
+    public String getMqttTopic() {
+        return this.mqttTopic;
+    }
+
+    /**
+     * <p>
+     * The MQTT topic of the message.
+     * </p>
+     * 
+     * @param mqttTopic
+     *        The MQTT topic of the message.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public IotTopicPublishAction withMqttTopic(String mqttTopic) {
+        setMqttTopic(mqttTopic);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getMqttTopic() != null)
+            sb.append("MqttTopic: ").append(getMqttTopic());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof IotTopicPublishAction == false)
+            return false;
+        IotTopicPublishAction other = (IotTopicPublishAction) obj;
+        if (other.getMqttTopic() == null ^ this.getMqttTopic() == null)
+            return false;
+        if (other.getMqttTopic() != null && other.getMqttTopic().equals(this.getMqttTopic()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getMqttTopic() == null) ? 0 : getMqttTopic().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public IotTopicPublishAction clone() {
+        try {
+            return (IotTopicPublishAction) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.IotTopicPublishActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LimitExceededException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LimitExceededException.java
new file mode 100644
index 000000000000..02756732dd36
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LimitExceededException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * A limit was exceeded.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class LimitExceededException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new LimitExceededException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public LimitExceededException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelVersionsRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelVersionsRequest.java
new file mode 100644
index 000000000000..199c7666ee00
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelVersionsRequest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModelVersions"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorModelVersionsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model whose versions are returned.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     */
+    private String nextToken;
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     */
+    private Integer maxResults;
+
+    /**
+     * <p>
+     * The name of the detector model whose versions are returned.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model whose versions are returned.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model whose versions are returned.
+     * </p>
+     * 
+     * @return The name of the detector model whose versions are returned.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model whose versions are returned.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model whose versions are returned.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelVersionsRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @return The token for the next set of results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelVersionsRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     */
+
+    public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @return The maximum number of results to return at one time.
+     */
+
+    public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelVersionsRequest withMaxResults(Integer maxResults) {
+        setMaxResults(maxResults);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken()).append(",");
+        if (getMaxResults() != null)
+            sb.append("MaxResults: ").append(getMaxResults());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListDetectorModelVersionsRequest == false)
+            return false;
+        ListDetectorModelVersionsRequest other = (ListDetectorModelVersionsRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        if (other.getMaxResults() == null ^ this.getMaxResults() == null)
+            return false;
+        if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListDetectorModelVersionsRequest clone() {
+        return (ListDetectorModelVersionsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelVersionsResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelVersionsResult.java
new file mode 100644
index 000000000000..c71d3953678c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelVersionsResult.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModelVersions"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorModelVersionsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Summary information about the detector model versions.
+     * </p>
+     */
+    private java.util.List<DetectorModelVersionSummary> detectorModelVersionSummaries;
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * Summary information about the detector model versions.
+     * </p>
+     * 
+     * @return Summary information about the detector model versions.
+     */
+
+    public java.util.List<DetectorModelVersionSummary> getDetectorModelVersionSummaries() {
+        return detectorModelVersionSummaries;
+    }
+
+    /**
+     * <p>
+     * Summary information about the detector model versions.
+     * </p>
+     * 
+     * @param detectorModelVersionSummaries
+     *        Summary information about the detector model versions.
+     */
+
+    public void setDetectorModelVersionSummaries(java.util.Collection<DetectorModelVersionSummary> detectorModelVersionSummaries) {
+        if (detectorModelVersionSummaries == null) {
+            this.detectorModelVersionSummaries = null;
+            return;
+        }
+
+        this.detectorModelVersionSummaries = new java.util.ArrayList<DetectorModelVersionSummary>(detectorModelVersionSummaries);
+    }
+
+    /**
+     * <p>
+     * Summary information about the detector model versions.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setDetectorModelVersionSummaries(java.util.Collection)} or
+     * {@link #withDetectorModelVersionSummaries(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param detectorModelVersionSummaries
+     *        Summary information about the detector model versions.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelVersionsResult withDetectorModelVersionSummaries(DetectorModelVersionSummary... detectorModelVersionSummaries) {
+        if (this.detectorModelVersionSummaries == null) {
+            setDetectorModelVersionSummaries(new java.util.ArrayList<DetectorModelVersionSummary>(detectorModelVersionSummaries.length));
+        }
+        for (DetectorModelVersionSummary ele : detectorModelVersionSummaries) {
+            this.detectorModelVersionSummaries.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Summary information about the detector model versions.
+     * </p>
+     * 
+     * @param detectorModelVersionSummaries
+     *        Summary information about the detector model versions.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelVersionsResult withDetectorModelVersionSummaries(java.util.Collection<DetectorModelVersionSummary> detectorModelVersionSummaries) {
+        setDetectorModelVersionSummaries(detectorModelVersionSummaries);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelVersionsResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelVersionSummaries() != null)
+            sb.append("DetectorModelVersionSummaries: ").append(getDetectorModelVersionSummaries()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListDetectorModelVersionsResult == false)
+            return false;
+        ListDetectorModelVersionsResult other = (ListDetectorModelVersionsResult) obj;
+        if (other.getDetectorModelVersionSummaries() == null ^ this.getDetectorModelVersionSummaries() == null)
+            return false;
+        if (other.getDetectorModelVersionSummaries() != null
+                && other.getDetectorModelVersionSummaries().equals(this.getDetectorModelVersionSummaries()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelVersionSummaries() == null) ? 0 : getDetectorModelVersionSummaries().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListDetectorModelVersionsResult clone() {
+        try {
+            return (ListDetectorModelVersionsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelsRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelsRequest.java
new file mode 100644
index 000000000000..fd74d3e7dd29
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelsRequest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModels" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorModelsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     */
+    private String nextToken;
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     */
+    private Integer maxResults;
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @return The token for the next set of results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelsRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     */
+
+    public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @return The maximum number of results to return at one time.
+     */
+
+    public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelsRequest withMaxResults(Integer maxResults) {
+        setMaxResults(maxResults);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken()).append(",");
+        if (getMaxResults() != null)
+            sb.append("MaxResults: ").append(getMaxResults());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListDetectorModelsRequest == false)
+            return false;
+        ListDetectorModelsRequest other = (ListDetectorModelsRequest) obj;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        if (other.getMaxResults() == null ^ this.getMaxResults() == null)
+            return false;
+        if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListDetectorModelsRequest clone() {
+        return (ListDetectorModelsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelsResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelsResult.java
new file mode 100644
index 000000000000..e3dd61003077
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListDetectorModelsResult.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListDetectorModels" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorModelsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Summary information about the detector models.
+     * </p>
+     */
+    private java.util.List<DetectorModelSummary> detectorModelSummaries;
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * Summary information about the detector models.
+     * </p>
+     * 
+     * @return Summary information about the detector models.
+     */
+
+    public java.util.List<DetectorModelSummary> getDetectorModelSummaries() {
+        return detectorModelSummaries;
+    }
+
+    /**
+     * <p>
+     * Summary information about the detector models.
+     * </p>
+     * 
+     * @param detectorModelSummaries
+     *        Summary information about the detector models.
+     */
+
+    public void setDetectorModelSummaries(java.util.Collection<DetectorModelSummary> detectorModelSummaries) {
+        if (detectorModelSummaries == null) {
+            this.detectorModelSummaries = null;
+            return;
+        }
+
+        this.detectorModelSummaries = new java.util.ArrayList<DetectorModelSummary>(detectorModelSummaries);
+    }
+
+    /**
+     * <p>
+     * Summary information about the detector models.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setDetectorModelSummaries(java.util.Collection)} or
+     * {@link #withDetectorModelSummaries(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param detectorModelSummaries
+     *        Summary information about the detector models.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelsResult withDetectorModelSummaries(DetectorModelSummary... detectorModelSummaries) {
+        if (this.detectorModelSummaries == null) {
+            setDetectorModelSummaries(new java.util.ArrayList<DetectorModelSummary>(detectorModelSummaries.length));
+        }
+        for (DetectorModelSummary ele : detectorModelSummaries) {
+            this.detectorModelSummaries.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Summary information about the detector models.
+     * </p>
+     * 
+     * @param detectorModelSummaries
+     *        Summary information about the detector models.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelsResult withDetectorModelSummaries(java.util.Collection<DetectorModelSummary> detectorModelSummaries) {
+        setDetectorModelSummaries(detectorModelSummaries);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorModelsResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelSummaries() != null)
+            sb.append("DetectorModelSummaries: ").append(getDetectorModelSummaries()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListDetectorModelsResult == false)
+            return false;
+        ListDetectorModelsResult other = (ListDetectorModelsResult) obj;
+        if (other.getDetectorModelSummaries() == null ^ this.getDetectorModelSummaries() == null)
+            return false;
+        if (other.getDetectorModelSummaries() != null && other.getDetectorModelSummaries().equals(this.getDetectorModelSummaries()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelSummaries() == null) ? 0 : getDetectorModelSummaries().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListDetectorModelsResult clone() {
+        try {
+            return (ListDetectorModelsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListInputsRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListInputsRequest.java
new file mode 100644
index 000000000000..bc9340813d15
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListInputsRequest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListInputs" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListInputsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     */
+    private String nextToken;
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     */
+    private Integer maxResults;
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @return The token for the next set of results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListInputsRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     */
+
+    public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @return The maximum number of results to return at one time.
+     */
+
+    public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListInputsRequest withMaxResults(Integer maxResults) {
+        setMaxResults(maxResults);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken()).append(",");
+        if (getMaxResults() != null)
+            sb.append("MaxResults: ").append(getMaxResults());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListInputsRequest == false)
+            return false;
+        ListInputsRequest other = (ListInputsRequest) obj;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        if (other.getMaxResults() == null ^ this.getMaxResults() == null)
+            return false;
+        if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListInputsRequest clone() {
+        return (ListInputsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListInputsResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListInputsResult.java
new file mode 100644
index 000000000000..dd107c52e59c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListInputsResult.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListInputs" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListInputsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Summary information about the inputs.
+     * </p>
+     */
+    private java.util.List<InputSummary> inputSummaries;
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * Summary information about the inputs.
+     * </p>
+     * 
+     * @return Summary information about the inputs.
+     */
+
+    public java.util.List<InputSummary> getInputSummaries() {
+        return inputSummaries;
+    }
+
+    /**
+     * <p>
+     * Summary information about the inputs.
+     * </p>
+     * 
+     * @param inputSummaries
+     *        Summary information about the inputs.
+     */
+
+    public void setInputSummaries(java.util.Collection<InputSummary> inputSummaries) {
+        if (inputSummaries == null) {
+            this.inputSummaries = null;
+            return;
+        }
+
+        this.inputSummaries = new java.util.ArrayList<InputSummary>(inputSummaries);
+    }
+
+    /**
+     * <p>
+     * Summary information about the inputs.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setInputSummaries(java.util.Collection)} or {@link #withInputSummaries(java.util.Collection)} if you want
+     * to override the existing values.
+     * </p>
+     * 
+     * @param inputSummaries
+     *        Summary information about the inputs.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListInputsResult withInputSummaries(InputSummary... inputSummaries) {
+        if (this.inputSummaries == null) {
+            setInputSummaries(new java.util.ArrayList<InputSummary>(inputSummaries.length));
+        }
+        for (InputSummary ele : inputSummaries) {
+            this.inputSummaries.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Summary information about the inputs.
+     * </p>
+     * 
+     * @param inputSummaries
+     *        Summary information about the inputs.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListInputsResult withInputSummaries(java.util.Collection<InputSummary> inputSummaries) {
+        setInputSummaries(inputSummaries);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListInputsResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputSummaries() != null)
+            sb.append("InputSummaries: ").append(getInputSummaries()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListInputsResult == false)
+            return false;
+        ListInputsResult other = (ListInputsResult) obj;
+        if (other.getInputSummaries() == null ^ this.getInputSummaries() == null)
+            return false;
+        if (other.getInputSummaries() != null && other.getInputSummaries().equals(this.getInputSummaries()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputSummaries() == null) ? 0 : getInputSummaries().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListInputsResult clone() {
+        try {
+            return (ListInputsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListTagsForResourceRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListTagsForResourceRequest.java
new file mode 100644
index 000000000000..f33c9ca3a529
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListTagsForResourceRequest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListTagsForResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListTagsForResourceRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     */
+    private String resourceArn;
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @return The ARN of the resource.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListTagsForResourceRequest == false)
+            return false;
+        ListTagsForResourceRequest other = (ListTagsForResourceRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListTagsForResourceRequest clone() {
+        return (ListTagsForResourceRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListTagsForResourceResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListTagsForResourceResult.java
new file mode 100644
index 000000000000..a28ddf32e1f8
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ListTagsForResourceResult.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ListTagsForResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListTagsForResourceResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The list of tags assigned to the resource.
+     * </p>
+     */
+    private java.util.List<Tag> tags;
+
+    /**
+     * <p>
+     * The list of tags assigned to the resource.
+     * </p>
+     * 
+     * @return The list of tags assigned to the resource.
+     */
+
+    public java.util.List<Tag> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * The list of tags assigned to the resource.
+     * </p>
+     * 
+     * @param tags
+     *        The list of tags assigned to the resource.
+     */
+
+    public void setTags(java.util.Collection<Tag> tags) {
+        if (tags == null) {
+            this.tags = null;
+            return;
+        }
+
+        this.tags = new java.util.ArrayList<Tag>(tags);
+    }
+
+    /**
+     * <p>
+     * The list of tags assigned to the resource.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param tags
+     *        The list of tags assigned to the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceResult withTags(Tag... tags) {
+        if (this.tags == null) {
+            setTags(new java.util.ArrayList<Tag>(tags.length));
+        }
+        for (Tag ele : tags) {
+            this.tags.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The list of tags assigned to the resource.
+     * </p>
+     * 
+     * @param tags
+     *        The list of tags assigned to the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListTagsForResourceResult withTags(java.util.Collection<Tag> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListTagsForResourceResult == false)
+            return false;
+        ListTagsForResourceResult other = (ListTagsForResourceResult) obj;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListTagsForResourceResult clone() {
+        try {
+            return (ListTagsForResourceResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LoggingLevel.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LoggingLevel.java
new file mode 100644
index 000000000000..1be05fe9fd6d
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LoggingLevel.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum LoggingLevel {
+
+    ERROR("ERROR"),
+    INFO("INFO"),
+    DEBUG("DEBUG");
+
+    private String value;
+
+    private LoggingLevel(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return LoggingLevel corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static LoggingLevel fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (LoggingLevel enumEntry : LoggingLevel.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LoggingOptions.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LoggingOptions.java
new file mode 100644
index 000000000000..f21740fc92f7
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/LoggingOptions.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The values of the AWS IoT Events logging options.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/LoggingOptions" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class LoggingOptions implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     * </p>
+     */
+    private String roleArn;
+    /**
+     * <p>
+     * The logging level. Currently, only "ERROR" is supported.
+     * </p>
+     */
+    private String level;
+    /**
+     * <p>
+     * If TRUE, logging is enabled for AWS IoT Events.
+     * </p>
+     */
+    private Boolean enabled;
+    /**
+     * <p>
+     * Information that identifies those detector models and their detectors (instances) for which the logging level is
+     * given.
+     * </p>
+     */
+    private java.util.List<DetectorDebugOption> detectorDebugOptions;
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     * </p>
+     * 
+     * @return The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform logging.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public LoggingOptions withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The logging level. Currently, only "ERROR" is supported.
+     * </p>
+     * 
+     * @param level
+     *        The logging level. Currently, only "ERROR" is supported.
+     * @see LoggingLevel
+     */
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    /**
+     * <p>
+     * The logging level. Currently, only "ERROR" is supported.
+     * </p>
+     * 
+     * @return The logging level. Currently, only "ERROR" is supported.
+     * @see LoggingLevel
+     */
+
+    public String getLevel() {
+        return this.level;
+    }
+
+    /**
+     * <p>
+     * The logging level. Currently, only "ERROR" is supported.
+     * </p>
+     * 
+     * @param level
+     *        The logging level. Currently, only "ERROR" is supported.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see LoggingLevel
+     */
+
+    public LoggingOptions withLevel(String level) {
+        setLevel(level);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The logging level. Currently, only "ERROR" is supported.
+     * </p>
+     * 
+     * @param level
+     *        The logging level. Currently, only "ERROR" is supported.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see LoggingLevel
+     */
+
+    public LoggingOptions withLevel(LoggingLevel level) {
+        this.level = level.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * If TRUE, logging is enabled for AWS IoT Events.
+     * </p>
+     * 
+     * @param enabled
+     *        If TRUE, logging is enabled for AWS IoT Events.
+     */
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    /**
+     * <p>
+     * If TRUE, logging is enabled for AWS IoT Events.
+     * </p>
+     * 
+     * @return If TRUE, logging is enabled for AWS IoT Events.
+     */
+
+    public Boolean getEnabled() {
+        return this.enabled;
+    }
+
+    /**
+     * <p>
+     * If TRUE, logging is enabled for AWS IoT Events.
+     * </p>
+     * 
+     * @param enabled
+     *        If TRUE, logging is enabled for AWS IoT Events.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public LoggingOptions withEnabled(Boolean enabled) {
+        setEnabled(enabled);
+        return this;
+    }
+
+    /**
+     * <p>
+     * If TRUE, logging is enabled for AWS IoT Events.
+     * </p>
+     * 
+     * @return If TRUE, logging is enabled for AWS IoT Events.
+     */
+
+    public Boolean isEnabled() {
+        return this.enabled;
+    }
+
+    /**
+     * <p>
+     * Information that identifies those detector models and their detectors (instances) for which the logging level is
+     * given.
+     * </p>
+     * 
+     * @return Information that identifies those detector models and their detectors (instances) for which the logging
+     *         level is given.
+     */
+
+    public java.util.List<DetectorDebugOption> getDetectorDebugOptions() {
+        return detectorDebugOptions;
+    }
+
+    /**
+     * <p>
+     * Information that identifies those detector models and their detectors (instances) for which the logging level is
+     * given.
+     * </p>
+     * 
+     * @param detectorDebugOptions
+     *        Information that identifies those detector models and their detectors (instances) for which the logging
+     *        level is given.
+     */
+
+    public void setDetectorDebugOptions(java.util.Collection<DetectorDebugOption> detectorDebugOptions) {
+        if (detectorDebugOptions == null) {
+            this.detectorDebugOptions = null;
+            return;
+        }
+
+        this.detectorDebugOptions = new java.util.ArrayList<DetectorDebugOption>(detectorDebugOptions);
+    }
+
+    /**
+     * <p>
+     * Information that identifies those detector models and their detectors (instances) for which the logging level is
+     * given.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setDetectorDebugOptions(java.util.Collection)} or {@link #withDetectorDebugOptions(java.util.Collection)}
+     * if you want to override the existing values.
+     * </p>
+     * 
+     * @param detectorDebugOptions
+     *        Information that identifies those detector models and their detectors (instances) for which the logging
+     *        level is given.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public LoggingOptions withDetectorDebugOptions(DetectorDebugOption... detectorDebugOptions) {
+        if (this.detectorDebugOptions == null) {
+            setDetectorDebugOptions(new java.util.ArrayList<DetectorDebugOption>(detectorDebugOptions.length));
+        }
+        for (DetectorDebugOption ele : detectorDebugOptions) {
+            this.detectorDebugOptions.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information that identifies those detector models and their detectors (instances) for which the logging level is
+     * given.
+     * </p>
+     * 
+     * @param detectorDebugOptions
+     *        Information that identifies those detector models and their detectors (instances) for which the logging
+     *        level is given.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public LoggingOptions withDetectorDebugOptions(java.util.Collection<DetectorDebugOption> detectorDebugOptions) {
+        setDetectorDebugOptions(detectorDebugOptions);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn()).append(",");
+        if (getLevel() != null)
+            sb.append("Level: ").append(getLevel()).append(",");
+        if (getEnabled() != null)
+            sb.append("Enabled: ").append(getEnabled()).append(",");
+        if (getDetectorDebugOptions() != null)
+            sb.append("DetectorDebugOptions: ").append(getDetectorDebugOptions());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof LoggingOptions == false)
+            return false;
+        LoggingOptions other = (LoggingOptions) obj;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        if (other.getLevel() == null ^ this.getLevel() == null)
+            return false;
+        if (other.getLevel() != null && other.getLevel().equals(this.getLevel()) == false)
+            return false;
+        if (other.getEnabled() == null ^ this.getEnabled() == null)
+            return false;
+        if (other.getEnabled() != null && other.getEnabled().equals(this.getEnabled()) == false)
+            return false;
+        if (other.getDetectorDebugOptions() == null ^ this.getDetectorDebugOptions() == null)
+            return false;
+        if (other.getDetectorDebugOptions() != null && other.getDetectorDebugOptions().equals(this.getDetectorDebugOptions()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        hashCode = prime * hashCode + ((getLevel() == null) ? 0 : getLevel().hashCode());
+        hashCode = prime * hashCode + ((getEnabled() == null) ? 0 : getEnabled().hashCode());
+        hashCode = prime * hashCode + ((getDetectorDebugOptions() == null) ? 0 : getDetectorDebugOptions().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public LoggingOptions clone() {
+        try {
+            return (LoggingOptions) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.LoggingOptionsMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnEnterLifecycle.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnEnterLifecycle.java
new file mode 100644
index 000000000000..0f6eaca491a6
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnEnterLifecycle.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/OnEnterLifecycle" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class OnEnterLifecycle implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * </p>
+     */
+    private java.util.List<Event> events;
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @return Specifies the actions that are performed when the state is entered and the <code>condition</code> is
+     *         TRUE.
+     */
+
+    public java.util.List<Event> getEvents() {
+        return events;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     */
+
+    public void setEvents(java.util.Collection<Event> events) {
+        if (events == null) {
+            this.events = null;
+            return;
+        }
+
+        this.events = new java.util.ArrayList<Event>(events);
+    }
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnEnterLifecycle withEvents(Event... events) {
+        if (this.events == null) {
+            setEvents(new java.util.ArrayList<Event>(events.length));
+        }
+        for (Event ele : events) {
+            this.events.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnEnterLifecycle withEvents(java.util.Collection<Event> events) {
+        setEvents(events);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getEvents() != null)
+            sb.append("Events: ").append(getEvents());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof OnEnterLifecycle == false)
+            return false;
+        OnEnterLifecycle other = (OnEnterLifecycle) obj;
+        if (other.getEvents() == null ^ this.getEvents() == null)
+            return false;
+        if (other.getEvents() != null && other.getEvents().equals(this.getEvents()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getEvents() == null) ? 0 : getEvents().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public OnEnterLifecycle clone() {
+        try {
+            return (OnEnterLifecycle) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.OnEnterLifecycleMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnExitLifecycle.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnExitLifecycle.java
new file mode 100644
index 000000000000..16933b7c28e3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnExitLifecycle.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/OnExitLifecycle" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class OnExitLifecycle implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * </p>
+     */
+    private java.util.List<Event> events;
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @return Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     */
+
+    public java.util.List<Event> getEvents() {
+        return events;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     */
+
+    public void setEvents(java.util.Collection<Event> events) {
+        if (events == null) {
+            this.events = null;
+            return;
+        }
+
+        this.events = new java.util.ArrayList<Event>(events);
+    }
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnExitLifecycle withEvents(Event... events) {
+        if (this.events == null) {
+            setEvents(new java.util.ArrayList<Event>(events.length));
+        }
+        for (Event ele : events) {
+            this.events.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnExitLifecycle withEvents(java.util.Collection<Event> events) {
+        setEvents(events);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getEvents() != null)
+            sb.append("Events: ").append(getEvents());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof OnExitLifecycle == false)
+            return false;
+        OnExitLifecycle other = (OnExitLifecycle) obj;
+        if (other.getEvents() == null ^ this.getEvents() == null)
+            return false;
+        if (other.getEvents() != null && other.getEvents().equals(this.getEvents()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getEvents() == null) ? 0 : getEvents().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public OnExitLifecycle clone() {
+        try {
+            return (OnExitLifecycle) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.OnExitLifecycleMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnInputLifecycle.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnInputLifecycle.java
new file mode 100644
index 000000000000..9ce27ab8609e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/OnInputLifecycle.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/OnInputLifecycle" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class OnInputLifecycle implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * </p>
+     */
+    private java.util.List<Event> events;
+    /**
+     * <p>
+     * Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.
+     * </p>
+     */
+    private java.util.List<TransitionEvent> transitionEvents;
+
+    /**
+     * <p>
+     * Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * </p>
+     * 
+     * @return Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     */
+
+    public java.util.List<Event> getEvents() {
+        return events;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     */
+
+    public void setEvents(java.util.Collection<Event> events) {
+        if (events == null) {
+            this.events = null;
+            return;
+        }
+
+        this.events = new java.util.ArrayList<Event>(events);
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnInputLifecycle withEvents(Event... events) {
+        if (this.events == null) {
+            setEvents(new java.util.ArrayList<Event>(events.length));
+        }
+        for (Event ele : events) {
+            this.events.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * </p>
+     * 
+     * @param events
+     *        Specifies the actions performed when the <code>condition</code> evaluates to TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnInputLifecycle withEvents(java.util.Collection<Event> events) {
+        setEvents(events);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.
+     * </p>
+     * 
+     * @return Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to
+     *         TRUE.
+     */
+
+    public java.util.List<TransitionEvent> getTransitionEvents() {
+        return transitionEvents;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.
+     * </p>
+     * 
+     * @param transitionEvents
+     *        Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to
+     *        TRUE.
+     */
+
+    public void setTransitionEvents(java.util.Collection<TransitionEvent> transitionEvents) {
+        if (transitionEvents == null) {
+            this.transitionEvents = null;
+            return;
+        }
+
+        this.transitionEvents = new java.util.ArrayList<TransitionEvent>(transitionEvents);
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTransitionEvents(java.util.Collection)} or {@link #withTransitionEvents(java.util.Collection)} if you
+     * want to override the existing values.
+     * </p>
+     * 
+     * @param transitionEvents
+     *        Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to
+     *        TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnInputLifecycle withTransitionEvents(TransitionEvent... transitionEvents) {
+        if (this.transitionEvents == null) {
+            setTransitionEvents(new java.util.ArrayList<TransitionEvent>(transitionEvents.length));
+        }
+        for (TransitionEvent ele : transitionEvents) {
+            this.transitionEvents.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.
+     * </p>
+     * 
+     * @param transitionEvents
+     *        Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to
+     *        TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public OnInputLifecycle withTransitionEvents(java.util.Collection<TransitionEvent> transitionEvents) {
+        setTransitionEvents(transitionEvents);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getEvents() != null)
+            sb.append("Events: ").append(getEvents()).append(",");
+        if (getTransitionEvents() != null)
+            sb.append("TransitionEvents: ").append(getTransitionEvents());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof OnInputLifecycle == false)
+            return false;
+        OnInputLifecycle other = (OnInputLifecycle) obj;
+        if (other.getEvents() == null ^ this.getEvents() == null)
+            return false;
+        if (other.getEvents() != null && other.getEvents().equals(this.getEvents()) == false)
+            return false;
+        if (other.getTransitionEvents() == null ^ this.getTransitionEvents() == null)
+            return false;
+        if (other.getTransitionEvents() != null && other.getTransitionEvents().equals(this.getTransitionEvents()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getEvents() == null) ? 0 : getEvents().hashCode());
+        hashCode = prime * hashCode + ((getTransitionEvents() == null) ? 0 : getTransitionEvents().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public OnInputLifecycle clone() {
+        try {
+            return (OnInputLifecycle) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.OnInputLifecycleMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/PutLoggingOptionsRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/PutLoggingOptionsRequest.java
new file mode 100644
index 000000000000..482b8cfeca1a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/PutLoggingOptionsRequest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/PutLoggingOptions" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class PutLoggingOptionsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The new values of the AWS IoT Events logging options.
+     * </p>
+     */
+    private LoggingOptions loggingOptions;
+
+    /**
+     * <p>
+     * The new values of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param loggingOptions
+     *        The new values of the AWS IoT Events logging options.
+     */
+
+    public void setLoggingOptions(LoggingOptions loggingOptions) {
+        this.loggingOptions = loggingOptions;
+    }
+
+    /**
+     * <p>
+     * The new values of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @return The new values of the AWS IoT Events logging options.
+     */
+
+    public LoggingOptions getLoggingOptions() {
+        return this.loggingOptions;
+    }
+
+    /**
+     * <p>
+     * The new values of the AWS IoT Events logging options.
+     * </p>
+     * 
+     * @param loggingOptions
+     *        The new values of the AWS IoT Events logging options.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public PutLoggingOptionsRequest withLoggingOptions(LoggingOptions loggingOptions) {
+        setLoggingOptions(loggingOptions);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getLoggingOptions() != null)
+            sb.append("LoggingOptions: ").append(getLoggingOptions());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof PutLoggingOptionsRequest == false)
+            return false;
+        PutLoggingOptionsRequest other = (PutLoggingOptionsRequest) obj;
+        if (other.getLoggingOptions() == null ^ this.getLoggingOptions() == null)
+            return false;
+        if (other.getLoggingOptions() != null && other.getLoggingOptions().equals(this.getLoggingOptions()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getLoggingOptions() == null) ? 0 : getLoggingOptions().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public PutLoggingOptionsRequest clone() {
+        return (PutLoggingOptionsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/PutLoggingOptionsResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/PutLoggingOptionsResult.java
new file mode 100644
index 000000000000..41bb1f0f22c3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/PutLoggingOptionsResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/PutLoggingOptions" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class PutLoggingOptionsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof PutLoggingOptionsResult == false)
+            return false;
+        PutLoggingOptionsResult other = (PutLoggingOptionsResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public PutLoggingOptionsResult clone() {
+        try {
+            return (PutLoggingOptionsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResetTimerAction.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResetTimerAction.java
new file mode 100644
index 000000000000..e77ba4329691
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResetTimerAction.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information needed to reset the timer.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/ResetTimerAction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResetTimerAction implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the timer to reset.
+     * </p>
+     */
+    private String timerName;
+
+    /**
+     * <p>
+     * The name of the timer to reset.
+     * </p>
+     * 
+     * @param timerName
+     *        The name of the timer to reset.
+     */
+
+    public void setTimerName(String timerName) {
+        this.timerName = timerName;
+    }
+
+    /**
+     * <p>
+     * The name of the timer to reset.
+     * </p>
+     * 
+     * @return The name of the timer to reset.
+     */
+
+    public String getTimerName() {
+        return this.timerName;
+    }
+
+    /**
+     * <p>
+     * The name of the timer to reset.
+     * </p>
+     * 
+     * @param timerName
+     *        The name of the timer to reset.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ResetTimerAction withTimerName(String timerName) {
+        setTimerName(timerName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTimerName() != null)
+            sb.append("TimerName: ").append(getTimerName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ResetTimerAction == false)
+            return false;
+        ResetTimerAction other = (ResetTimerAction) obj;
+        if (other.getTimerName() == null ^ this.getTimerName() == null)
+            return false;
+        if (other.getTimerName() != null && other.getTimerName().equals(this.getTimerName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTimerName() == null) ? 0 : getTimerName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ResetTimerAction clone() {
+        try {
+            return (ResetTimerAction) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.ResetTimerActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceAlreadyExistsException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceAlreadyExistsException.java
new file mode 100644
index 000000000000..bf201732ebf8
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceAlreadyExistsException.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The resource already exists.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResourceAlreadyExistsException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * The ID of the resource.
+     * </p>
+     */
+    private String resourceId;
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     */
+    private String resourceArn;
+
+    /**
+     * Constructs a new ResourceAlreadyExistsException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ResourceAlreadyExistsException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>
+     * The ID of the resource.
+     * </p>
+     * 
+     * @param resourceId
+     *        The ID of the resource.
+     */
+
+    @com.fasterxml.jackson.annotation.JsonProperty("resourceId")
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    /**
+     * <p>
+     * The ID of the resource.
+     * </p>
+     * 
+     * @return The ID of the resource.
+     */
+
+    @com.fasterxml.jackson.annotation.JsonProperty("resourceId")
+    public String getResourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * <p>
+     * The ID of the resource.
+     * </p>
+     * 
+     * @param resourceId
+     *        The ID of the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ResourceAlreadyExistsException withResourceId(String resourceId) {
+        setResourceId(resourceId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     */
+
+    @com.fasterxml.jackson.annotation.JsonProperty("resourceArn")
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @return The ARN of the resource.
+     */
+
+    @com.fasterxml.jackson.annotation.JsonProperty("resourceArn")
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ResourceAlreadyExistsException withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceInUseException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceInUseException.java
new file mode 100644
index 000000000000..ac9bb9d06e6f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceInUseException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The resource is in use.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResourceInUseException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ResourceInUseException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ResourceInUseException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceNotFoundException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceNotFoundException.java
new file mode 100644
index 000000000000..bd266c2362c2
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ResourceNotFoundException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The resource was not found.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResourceNotFoundException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ResourceNotFoundException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SNSTopicPublishAction.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SNSTopicPublishAction.java
new file mode 100644
index 000000000000..2c773ac38e27
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SNSTopicPublishAction.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information required to publish the Amazon SNS message.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/SNSTopicPublishAction" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SNSTopicPublishAction implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ARN of the Amazon SNS target to which the message is sent.
+     * </p>
+     */
+    private String targetArn;
+
+    /**
+     * <p>
+     * The ARN of the Amazon SNS target to which the message is sent.
+     * </p>
+     * 
+     * @param targetArn
+     *        The ARN of the Amazon SNS target to which the message is sent.
+     */
+
+    public void setTargetArn(String targetArn) {
+        this.targetArn = targetArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the Amazon SNS target to which the message is sent.
+     * </p>
+     * 
+     * @return The ARN of the Amazon SNS target to which the message is sent.
+     */
+
+    public String getTargetArn() {
+        return this.targetArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the Amazon SNS target to which the message is sent.
+     * </p>
+     * 
+     * @param targetArn
+     *        The ARN of the Amazon SNS target to which the message is sent.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SNSTopicPublishAction withTargetArn(String targetArn) {
+        setTargetArn(targetArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTargetArn() != null)
+            sb.append("TargetArn: ").append(getTargetArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof SNSTopicPublishAction == false)
+            return false;
+        SNSTopicPublishAction other = (SNSTopicPublishAction) obj;
+        if (other.getTargetArn() == null ^ this.getTargetArn() == null)
+            return false;
+        if (other.getTargetArn() != null && other.getTargetArn().equals(this.getTargetArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTargetArn() == null) ? 0 : getTargetArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public SNSTopicPublishAction clone() {
+        try {
+            return (SNSTopicPublishAction) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.SNSTopicPublishActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ServiceUnavailableException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ServiceUnavailableException.java
new file mode 100644
index 000000000000..b8932f928327
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ServiceUnavailableException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The service is currently unavailable.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceUnavailableException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ServiceUnavailableException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ServiceUnavailableException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SetTimerAction.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SetTimerAction.java
new file mode 100644
index 000000000000..35f709435a53
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SetTimerAction.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information needed to set the timer.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/SetTimerAction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SetTimerAction implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     */
+    private String timerName;
+    /**
+     * <p>
+     * The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     * </p>
+     */
+    private Integer seconds;
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @param timerName
+     *        The name of the timer.
+     */
+
+    public void setTimerName(String timerName) {
+        this.timerName = timerName;
+    }
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @return The name of the timer.
+     */
+
+    public String getTimerName() {
+        return this.timerName;
+    }
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @param timerName
+     *        The name of the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SetTimerAction withTimerName(String timerName) {
+        setTimerName(timerName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     * </p>
+     * 
+     * @param seconds
+     *        The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     */
+
+    public void setSeconds(Integer seconds) {
+        this.seconds = seconds;
+    }
+
+    /**
+     * <p>
+     * The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     * </p>
+     * 
+     * @return The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     */
+
+    public Integer getSeconds() {
+        return this.seconds;
+    }
+
+    /**
+     * <p>
+     * The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     * </p>
+     * 
+     * @param seconds
+     *        The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SetTimerAction withSeconds(Integer seconds) {
+        setSeconds(seconds);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTimerName() != null)
+            sb.append("TimerName: ").append(getTimerName()).append(",");
+        if (getSeconds() != null)
+            sb.append("Seconds: ").append(getSeconds());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof SetTimerAction == false)
+            return false;
+        SetTimerAction other = (SetTimerAction) obj;
+        if (other.getTimerName() == null ^ this.getTimerName() == null)
+            return false;
+        if (other.getTimerName() != null && other.getTimerName().equals(this.getTimerName()) == false)
+            return false;
+        if (other.getSeconds() == null ^ this.getSeconds() == null)
+            return false;
+        if (other.getSeconds() != null && other.getSeconds().equals(this.getSeconds()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTimerName() == null) ? 0 : getTimerName().hashCode());
+        hashCode = prime * hashCode + ((getSeconds() == null) ? 0 : getSeconds().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public SetTimerAction clone() {
+        try {
+            return (SetTimerAction) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.SetTimerActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SetVariableAction.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SetVariableAction.java
new file mode 100644
index 000000000000..ef8133395b06
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/SetVariableAction.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the variable and its new value.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/SetVariableAction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SetVariableAction implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     */
+    private String variableName;
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     */
+    private String value;
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @param variableName
+     *        The name of the variable.
+     */
+
+    public void setVariableName(String variableName) {
+        this.variableName = variableName;
+    }
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @return The name of the variable.
+     */
+
+    public String getVariableName() {
+        return this.variableName;
+    }
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @param variableName
+     *        The name of the variable.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SetVariableAction withVariableName(String variableName) {
+        setVariableName(variableName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     * 
+     * @param value
+     *        The new value of the variable.
+     */
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     * 
+     * @return The new value of the variable.
+     */
+
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     * 
+     * @param value
+     *        The new value of the variable.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SetVariableAction withValue(String value) {
+        setValue(value);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getVariableName() != null)
+            sb.append("VariableName: ").append(getVariableName()).append(",");
+        if (getValue() != null)
+            sb.append("Value: ").append(getValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof SetVariableAction == false)
+            return false;
+        SetVariableAction other = (SetVariableAction) obj;
+        if (other.getVariableName() == null ^ this.getVariableName() == null)
+            return false;
+        if (other.getVariableName() != null && other.getVariableName().equals(this.getVariableName()) == false)
+            return false;
+        if (other.getValue() == null ^ this.getValue() == null)
+            return false;
+        if (other.getValue() != null && other.getValue().equals(this.getValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getVariableName() == null) ? 0 : getVariableName().hashCode());
+        hashCode = prime * hashCode + ((getValue() == null) ? 0 : getValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public SetVariableAction clone() {
+        try {
+            return (SetVariableAction) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.SetVariableActionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/State.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/State.java
new file mode 100644
index 000000000000..37e32917be83
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/State.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information that defines a state of a detector.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/State" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class State implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     */
+    private String stateName;
+    /**
+     * <p>
+     * When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.
+     * </p>
+     */
+    private OnInputLifecycle onInput;
+    /**
+     * <p>
+     * When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     * </p>
+     */
+    private OnEnterLifecycle onEnter;
+    /**
+     * <p>
+     * When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.
+     * </p>
+     */
+    private OnExitLifecycle onExit;
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the state.
+     */
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @return The name of the state.
+     */
+
+    public String getStateName() {
+        return this.stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the state.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public State withStateName(String stateName) {
+        setStateName(stateName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.
+     * </p>
+     * 
+     * @param onInput
+     *        When an input is received and the <code>condition</code> is TRUE, perform the specified
+     *        <code>actions</code>.
+     */
+
+    public void setOnInput(OnInputLifecycle onInput) {
+        this.onInput = onInput;
+    }
+
+    /**
+     * <p>
+     * When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.
+     * </p>
+     * 
+     * @return When an input is received and the <code>condition</code> is TRUE, perform the specified
+     *         <code>actions</code>.
+     */
+
+    public OnInputLifecycle getOnInput() {
+        return this.onInput;
+    }
+
+    /**
+     * <p>
+     * When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.
+     * </p>
+     * 
+     * @param onInput
+     *        When an input is received and the <code>condition</code> is TRUE, perform the specified
+     *        <code>actions</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public State withOnInput(OnInputLifecycle onInput) {
+        setOnInput(onInput);
+        return this;
+    }
+
+    /**
+     * <p>
+     * When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param onEnter
+     *        When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     */
+
+    public void setOnEnter(OnEnterLifecycle onEnter) {
+        this.onEnter = onEnter;
+    }
+
+    /**
+     * <p>
+     * When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @return When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     */
+
+    public OnEnterLifecycle getOnEnter() {
+        return this.onEnter;
+    }
+
+    /**
+     * <p>
+     * When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param onEnter
+     *        When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public State withOnEnter(OnEnterLifecycle onEnter) {
+        setOnEnter(onEnter);
+        return this;
+    }
+
+    /**
+     * <p>
+     * When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param onExit
+     *        When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is
+     *        TRUE.
+     */
+
+    public void setOnExit(OnExitLifecycle onExit) {
+        this.onExit = onExit;
+    }
+
+    /**
+     * <p>
+     * When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @return When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is
+     *         TRUE.
+     */
+
+    public OnExitLifecycle getOnExit() {
+        return this.onExit;
+    }
+
+    /**
+     * <p>
+     * When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.
+     * </p>
+     * 
+     * @param onExit
+     *        When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is
+     *        TRUE.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public State withOnExit(OnExitLifecycle onExit) {
+        setOnExit(onExit);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getStateName() != null)
+            sb.append("StateName: ").append(getStateName()).append(",");
+        if (getOnInput() != null)
+            sb.append("OnInput: ").append(getOnInput()).append(",");
+        if (getOnEnter() != null)
+            sb.append("OnEnter: ").append(getOnEnter()).append(",");
+        if (getOnExit() != null)
+            sb.append("OnExit: ").append(getOnExit());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof State == false)
+            return false;
+        State other = (State) obj;
+        if (other.getStateName() == null ^ this.getStateName() == null)
+            return false;
+        if (other.getStateName() != null && other.getStateName().equals(this.getStateName()) == false)
+            return false;
+        if (other.getOnInput() == null ^ this.getOnInput() == null)
+            return false;
+        if (other.getOnInput() != null && other.getOnInput().equals(this.getOnInput()) == false)
+            return false;
+        if (other.getOnEnter() == null ^ this.getOnEnter() == null)
+            return false;
+        if (other.getOnEnter() != null && other.getOnEnter().equals(this.getOnEnter()) == false)
+            return false;
+        if (other.getOnExit() == null ^ this.getOnExit() == null)
+            return false;
+        if (other.getOnExit() != null && other.getOnExit().equals(this.getOnExit()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getStateName() == null) ? 0 : getStateName().hashCode());
+        hashCode = prime * hashCode + ((getOnInput() == null) ? 0 : getOnInput().hashCode());
+        hashCode = prime * hashCode + ((getOnEnter() == null) ? 0 : getOnEnter().hashCode());
+        hashCode = prime * hashCode + ((getOnExit() == null) ? 0 : getOnExit().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public State clone() {
+        try {
+            return (State) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.StateMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Tag.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Tag.java
new file mode 100644
index 000000000000..eb6b04a32da0
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/Tag.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Metadata which can be used to manage the resource.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/Tag" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Tag implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The tag's key.
+     * </p>
+     */
+    private String key;
+    /**
+     * <p>
+     * The tag's value.
+     * </p>
+     */
+    private String value;
+
+    /**
+     * <p>
+     * The tag's key.
+     * </p>
+     * 
+     * @param key
+     *        The tag's key.
+     */
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    /**
+     * <p>
+     * The tag's key.
+     * </p>
+     * 
+     * @return The tag's key.
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     * <p>
+     * The tag's key.
+     * </p>
+     * 
+     * @param key
+     *        The tag's key.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Tag withKey(String key) {
+        setKey(key);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The tag's value.
+     * </p>
+     * 
+     * @param value
+     *        The tag's value.
+     */
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * <p>
+     * The tag's value.
+     * </p>
+     * 
+     * @return The tag's value.
+     */
+
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * <p>
+     * The tag's value.
+     * </p>
+     * 
+     * @param value
+     *        The tag's value.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Tag withValue(String value) {
+        setValue(value);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getKey() != null)
+            sb.append("Key: ").append(getKey()).append(",");
+        if (getValue() != null)
+            sb.append("Value: ").append(getValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Tag == false)
+            return false;
+        Tag other = (Tag) obj;
+        if (other.getKey() == null ^ this.getKey() == null)
+            return false;
+        if (other.getKey() != null && other.getKey().equals(this.getKey()) == false)
+            return false;
+        if (other.getValue() == null ^ this.getValue() == null)
+            return false;
+        if (other.getValue() != null && other.getValue().equals(this.getValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getKey() == null) ? 0 : getKey().hashCode());
+        hashCode = prime * hashCode + ((getValue() == null) ? 0 : getValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Tag clone() {
+        try {
+            return (Tag) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.TagMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TagResourceRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TagResourceRequest.java
new file mode 100644
index 000000000000..8eb3ce5eb0d9
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TagResourceRequest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagResourceRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The new or modified tags for the resource.
+     * </p>
+     */
+    private java.util.List<Tag> tags;
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @return The ARN of the resource.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TagResourceRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new or modified tags for the resource.
+     * </p>
+     * 
+     * @return The new or modified tags for the resource.
+     */
+
+    public java.util.List<Tag> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * The new or modified tags for the resource.
+     * </p>
+     * 
+     * @param tags
+     *        The new or modified tags for the resource.
+     */
+
+    public void setTags(java.util.Collection<Tag> tags) {
+        if (tags == null) {
+            this.tags = null;
+            return;
+        }
+
+        this.tags = new java.util.ArrayList<Tag>(tags);
+    }
+
+    /**
+     * <p>
+     * The new or modified tags for the resource.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param tags
+     *        The new or modified tags for the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TagResourceRequest withTags(Tag... tags) {
+        if (this.tags == null) {
+            setTags(new java.util.ArrayList<Tag>(tags.length));
+        }
+        for (Tag ele : tags) {
+            this.tags.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new or modified tags for the resource.
+     * </p>
+     * 
+     * @param tags
+     *        The new or modified tags for the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TagResourceRequest withTags(java.util.Collection<Tag> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof TagResourceRequest == false)
+            return false;
+        TagResourceRequest other = (TagResourceRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public TagResourceRequest clone() {
+        return (TagResourceRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TagResourceResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TagResourceResult.java
new file mode 100644
index 000000000000..161f1cfc67da
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TagResourceResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagResourceResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof TagResourceResult == false)
+            return false;
+        TagResourceResult other = (TagResourceResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public TagResourceResult clone() {
+        try {
+            return (TagResourceResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ThrottlingException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ThrottlingException.java
new file mode 100644
index 000000000000..d73d09a92471
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/ThrottlingException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The request could not be completed due to throttling.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ThrottlingException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ThrottlingException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ThrottlingException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TransitionEvent.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TransitionEvent.java
new file mode 100644
index 000000000000..822d2b4f15a8
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/TransitionEvent.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/TransitionEvent" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TransitionEvent implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the transition event.
+     * </p>
+     */
+    private String eventName;
+    /**
+     * <p>
+     * [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code>
+     * to be entered.
+     * </p>
+     */
+    private String condition;
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     */
+    private java.util.List<Action> actions;
+    /**
+     * <p>
+     * The next state to enter.
+     * </p>
+     */
+    private String nextState;
+
+    /**
+     * <p>
+     * The name of the transition event.
+     * </p>
+     * 
+     * @param eventName
+     *        The name of the transition event.
+     */
+
+    public void setEventName(String eventName) {
+        this.eventName = eventName;
+    }
+
+    /**
+     * <p>
+     * The name of the transition event.
+     * </p>
+     * 
+     * @return The name of the transition event.
+     */
+
+    public String getEventName() {
+        return this.eventName;
+    }
+
+    /**
+     * <p>
+     * The name of the transition event.
+     * </p>
+     * 
+     * @param eventName
+     *        The name of the transition event.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TransitionEvent withEventName(String eventName) {
+        setEventName(eventName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code>
+     * to be entered.
+     * </p>
+     * 
+     * @param condition
+     *        [Required] A Boolean expression that when TRUE causes the actions to be performed and the
+     *        <code>nextState</code> to be entered.
+     */
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
+
+    /**
+     * <p>
+     * [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code>
+     * to be entered.
+     * </p>
+     * 
+     * @return [Required] A Boolean expression that when TRUE causes the actions to be performed and the
+     *         <code>nextState</code> to be entered.
+     */
+
+    public String getCondition() {
+        return this.condition;
+    }
+
+    /**
+     * <p>
+     * [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code>
+     * to be entered.
+     * </p>
+     * 
+     * @param condition
+     *        [Required] A Boolean expression that when TRUE causes the actions to be performed and the
+     *        <code>nextState</code> to be entered.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TransitionEvent withCondition(String condition) {
+        setCondition(condition);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * 
+     * @return The actions to be performed.
+     */
+
+    public java.util.List<Action> getActions() {
+        return actions;
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * 
+     * @param actions
+     *        The actions to be performed.
+     */
+
+    public void setActions(java.util.Collection<Action> actions) {
+        if (actions == null) {
+            this.actions = null;
+            return;
+        }
+
+        this.actions = new java.util.ArrayList<Action>(actions);
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setActions(java.util.Collection)} or {@link #withActions(java.util.Collection)} if you want to override
+     * the existing values.
+     * </p>
+     * 
+     * @param actions
+     *        The actions to be performed.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TransitionEvent withActions(Action... actions) {
+        if (this.actions == null) {
+            setActions(new java.util.ArrayList<Action>(actions.length));
+        }
+        for (Action ele : actions) {
+            this.actions.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The actions to be performed.
+     * </p>
+     * 
+     * @param actions
+     *        The actions to be performed.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TransitionEvent withActions(java.util.Collection<Action> actions) {
+        setActions(actions);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The next state to enter.
+     * </p>
+     * 
+     * @param nextState
+     *        The next state to enter.
+     */
+
+    public void setNextState(String nextState) {
+        this.nextState = nextState;
+    }
+
+    /**
+     * <p>
+     * The next state to enter.
+     * </p>
+     * 
+     * @return The next state to enter.
+     */
+
+    public String getNextState() {
+        return this.nextState;
+    }
+
+    /**
+     * <p>
+     * The next state to enter.
+     * </p>
+     * 
+     * @param nextState
+     *        The next state to enter.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TransitionEvent withNextState(String nextState) {
+        setNextState(nextState);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getEventName() != null)
+            sb.append("EventName: ").append(getEventName()).append(",");
+        if (getCondition() != null)
+            sb.append("Condition: ").append(getCondition()).append(",");
+        if (getActions() != null)
+            sb.append("Actions: ").append(getActions()).append(",");
+        if (getNextState() != null)
+            sb.append("NextState: ").append(getNextState());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof TransitionEvent == false)
+            return false;
+        TransitionEvent other = (TransitionEvent) obj;
+        if (other.getEventName() == null ^ this.getEventName() == null)
+            return false;
+        if (other.getEventName() != null && other.getEventName().equals(this.getEventName()) == false)
+            return false;
+        if (other.getCondition() == null ^ this.getCondition() == null)
+            return false;
+        if (other.getCondition() != null && other.getCondition().equals(this.getCondition()) == false)
+            return false;
+        if (other.getActions() == null ^ this.getActions() == null)
+            return false;
+        if (other.getActions() != null && other.getActions().equals(this.getActions()) == false)
+            return false;
+        if (other.getNextState() == null ^ this.getNextState() == null)
+            return false;
+        if (other.getNextState() != null && other.getNextState().equals(this.getNextState()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getEventName() == null) ? 0 : getEventName().hashCode());
+        hashCode = prime * hashCode + ((getCondition() == null) ? 0 : getCondition().hashCode());
+        hashCode = prime * hashCode + ((getActions() == null) ? 0 : getActions().hashCode());
+        hashCode = prime * hashCode + ((getNextState() == null) ? 0 : getNextState().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public TransitionEvent clone() {
+        try {
+            return (TransitionEvent) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.iotevents.model.transform.TransitionEventMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UnsupportedOperationException.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UnsupportedOperationException.java
new file mode 100644
index 000000000000..7beafb886fed
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UnsupportedOperationException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The requested operation is not supported.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UnsupportedOperationException extends com.amazonaws.services.iotevents.model.AWSIoTEventsException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new UnsupportedOperationException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public UnsupportedOperationException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UntagResourceRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UntagResourceRequest.java
new file mode 100644
index 000000000000..7003ce107b0c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UntagResourceRequest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UntagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UntagResourceRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * A list of the keys of the tags to be removed from the resource.
+     * </p>
+     */
+    private java.util.List<String> tagKeys;
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @return The ARN of the resource.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the resource.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The ARN of the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UntagResourceRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A list of the keys of the tags to be removed from the resource.
+     * </p>
+     * 
+     * @return A list of the keys of the tags to be removed from the resource.
+     */
+
+    public java.util.List<String> getTagKeys() {
+        return tagKeys;
+    }
+
+    /**
+     * <p>
+     * A list of the keys of the tags to be removed from the resource.
+     * </p>
+     * 
+     * @param tagKeys
+     *        A list of the keys of the tags to be removed from the resource.
+     */
+
+    public void setTagKeys(java.util.Collection<String> tagKeys) {
+        if (tagKeys == null) {
+            this.tagKeys = null;
+            return;
+        }
+
+        this.tagKeys = new java.util.ArrayList<String>(tagKeys);
+    }
+
+    /**
+     * <p>
+     * A list of the keys of the tags to be removed from the resource.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override
+     * the existing values.
+     * </p>
+     * 
+     * @param tagKeys
+     *        A list of the keys of the tags to be removed from the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UntagResourceRequest withTagKeys(String... tagKeys) {
+        if (this.tagKeys == null) {
+            setTagKeys(new java.util.ArrayList<String>(tagKeys.length));
+        }
+        for (String ele : tagKeys) {
+            this.tagKeys.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * A list of the keys of the tags to be removed from the resource.
+     * </p>
+     * 
+     * @param tagKeys
+     *        A list of the keys of the tags to be removed from the resource.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UntagResourceRequest withTagKeys(java.util.Collection<String> tagKeys) {
+        setTagKeys(tagKeys);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getTagKeys() != null)
+            sb.append("TagKeys: ").append(getTagKeys());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UntagResourceRequest == false)
+            return false;
+        UntagResourceRequest other = (UntagResourceRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getTagKeys() == null ^ this.getTagKeys() == null)
+            return false;
+        if (other.getTagKeys() != null && other.getTagKeys().equals(this.getTagKeys()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getTagKeys() == null) ? 0 : getTagKeys().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UntagResourceRequest clone() {
+        return (UntagResourceRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UntagResourceResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UntagResourceResult.java
new file mode 100644
index 000000000000..5499d7baba58
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UntagResourceResult.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UntagResource" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UntagResourceResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UntagResourceResult == false)
+            return false;
+        UntagResourceResult other = (UntagResourceResult) obj;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        return hashCode;
+    }
+
+    @Override
+    public UntagResourceResult clone() {
+        try {
+            return (UntagResourceResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateDetectorModelRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateDetectorModelRequest.java
new file mode 100644
index 000000000000..c25fdbc8ce4e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateDetectorModelRequest.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateDetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateDetectorModelRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model to be updated.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     */
+    private DetectorModelDefinition detectorModelDefinition;
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     */
+    private String detectorModelDescription;
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     */
+    private String roleArn;
+
+    /**
+     * <p>
+     * The name of the detector model to be updated.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model to be updated.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model to be updated.
+     * </p>
+     * 
+     * @return The name of the detector model to be updated.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model to be updated.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model to be updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorModelRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     * 
+     * @param detectorModelDefinition
+     *        Information that defines how a detector operates.
+     */
+
+    public void setDetectorModelDefinition(DetectorModelDefinition detectorModelDefinition) {
+        this.detectorModelDefinition = detectorModelDefinition;
+    }
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     * 
+     * @return Information that defines how a detector operates.
+     */
+
+    public DetectorModelDefinition getDetectorModelDefinition() {
+        return this.detectorModelDefinition;
+    }
+
+    /**
+     * <p>
+     * Information that defines how a detector operates.
+     * </p>
+     * 
+     * @param detectorModelDefinition
+     *        Information that defines how a detector operates.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorModelRequest withDetectorModelDefinition(DetectorModelDefinition detectorModelDefinition) {
+        setDetectorModelDefinition(detectorModelDefinition);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     */
+
+    public void setDetectorModelDescription(String detectorModelDescription) {
+        this.detectorModelDescription = detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @return A brief description of the detector model.
+     */
+
+    public String getDetectorModelDescription() {
+        return this.detectorModelDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the detector model.
+     * </p>
+     * 
+     * @param detectorModelDescription
+     *        A brief description of the detector model.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorModelRequest withDetectorModelDescription(String detectorModelDescription) {
+        setDetectorModelDescription(detectorModelDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     */
+
+    public void setRoleArn(String roleArn) {
+        this.roleArn = roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @return The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     */
+
+    public String getRoleArn() {
+        return this.roleArn;
+    }
+
+    /**
+     * <p>
+     * The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * </p>
+     * 
+     * @param roleArn
+     *        The ARN of the role that grants permission to AWS IoT Events to perform its operations.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorModelRequest withRoleArn(String roleArn) {
+        setRoleArn(roleArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getDetectorModelDefinition() != null)
+            sb.append("DetectorModelDefinition: ").append(getDetectorModelDefinition()).append(",");
+        if (getDetectorModelDescription() != null)
+            sb.append("DetectorModelDescription: ").append(getDetectorModelDescription()).append(",");
+        if (getRoleArn() != null)
+            sb.append("RoleArn: ").append(getRoleArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateDetectorModelRequest == false)
+            return false;
+        UpdateDetectorModelRequest other = (UpdateDetectorModelRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getDetectorModelDefinition() == null ^ this.getDetectorModelDefinition() == null)
+            return false;
+        if (other.getDetectorModelDefinition() != null && other.getDetectorModelDefinition().equals(this.getDetectorModelDefinition()) == false)
+            return false;
+        if (other.getDetectorModelDescription() == null ^ this.getDetectorModelDescription() == null)
+            return false;
+        if (other.getDetectorModelDescription() != null && other.getDetectorModelDescription().equals(this.getDetectorModelDescription()) == false)
+            return false;
+        if (other.getRoleArn() == null ^ this.getRoleArn() == null)
+            return false;
+        if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelDefinition() == null) ? 0 : getDetectorModelDefinition().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelDescription() == null) ? 0 : getDetectorModelDescription().hashCode());
+        hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateDetectorModelRequest clone() {
+        return (UpdateDetectorModelRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateDetectorModelResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateDetectorModelResult.java
new file mode 100644
index 000000000000..d6da06dd8114
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateDetectorModelResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateDetectorModel" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateDetectorModelResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     */
+    private DetectorModelConfiguration detectorModelConfiguration;
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     * 
+     * @param detectorModelConfiguration
+     *        Information about how the detector model is configured.
+     */
+
+    public void setDetectorModelConfiguration(DetectorModelConfiguration detectorModelConfiguration) {
+        this.detectorModelConfiguration = detectorModelConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     * 
+     * @return Information about how the detector model is configured.
+     */
+
+    public DetectorModelConfiguration getDetectorModelConfiguration() {
+        return this.detectorModelConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about how the detector model is configured.
+     * </p>
+     * 
+     * @param detectorModelConfiguration
+     *        Information about how the detector model is configured.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorModelResult withDetectorModelConfiguration(DetectorModelConfiguration detectorModelConfiguration) {
+        setDetectorModelConfiguration(detectorModelConfiguration);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelConfiguration() != null)
+            sb.append("DetectorModelConfiguration: ").append(getDetectorModelConfiguration());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateDetectorModelResult == false)
+            return false;
+        UpdateDetectorModelResult other = (UpdateDetectorModelResult) obj;
+        if (other.getDetectorModelConfiguration() == null ^ this.getDetectorModelConfiguration() == null)
+            return false;
+        if (other.getDetectorModelConfiguration() != null && other.getDetectorModelConfiguration().equals(this.getDetectorModelConfiguration()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelConfiguration() == null) ? 0 : getDetectorModelConfiguration().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateDetectorModelResult clone() {
+        try {
+            return (UpdateDetectorModelResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateInputRequest.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateInputRequest.java
new file mode 100644
index 000000000000..750e25f94c4c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateInputRequest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateInputRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the input you want to update.
+     * </p>
+     */
+    private String inputName;
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     */
+    private String inputDescription;
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     */
+    private InputDefinition inputDefinition;
+
+    /**
+     * <p>
+     * The name of the input you want to update.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input you want to update.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input you want to update.
+     * </p>
+     * 
+     * @return The name of the input you want to update.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input you want to update.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input you want to update.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateInputRequest withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     */
+
+    public void setInputDescription(String inputDescription) {
+        this.inputDescription = inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @return A brief description of the input.
+     */
+
+    public String getInputDescription() {
+        return this.inputDescription;
+    }
+
+    /**
+     * <p>
+     * A brief description of the input.
+     * </p>
+     * 
+     * @param inputDescription
+     *        A brief description of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateInputRequest withInputDescription(String inputDescription) {
+        setInputDescription(inputDescription);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @param inputDefinition
+     *        The definition of the input.
+     */
+
+    public void setInputDefinition(InputDefinition inputDefinition) {
+        this.inputDefinition = inputDefinition;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @return The definition of the input.
+     */
+
+    public InputDefinition getInputDefinition() {
+        return this.inputDefinition;
+    }
+
+    /**
+     * <p>
+     * The definition of the input.
+     * </p>
+     * 
+     * @param inputDefinition
+     *        The definition of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateInputRequest withInputDefinition(InputDefinition inputDefinition) {
+        setInputDefinition(inputDefinition);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName()).append(",");
+        if (getInputDescription() != null)
+            sb.append("InputDescription: ").append(getInputDescription()).append(",");
+        if (getInputDefinition() != null)
+            sb.append("InputDefinition: ").append(getInputDefinition());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateInputRequest == false)
+            return false;
+        UpdateInputRequest other = (UpdateInputRequest) obj;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        if (other.getInputDescription() == null ^ this.getInputDescription() == null)
+            return false;
+        if (other.getInputDescription() != null && other.getInputDescription().equals(this.getInputDescription()) == false)
+            return false;
+        if (other.getInputDefinition() == null ^ this.getInputDefinition() == null)
+            return false;
+        if (other.getInputDefinition() != null && other.getInputDefinition().equals(this.getInputDefinition()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        hashCode = prime * hashCode + ((getInputDescription() == null) ? 0 : getInputDescription().hashCode());
+        hashCode = prime * hashCode + ((getInputDefinition() == null) ? 0 : getInputDefinition().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateInputRequest clone() {
+        return (UpdateInputRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateInputResult.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateInputResult.java
new file mode 100644
index 000000000000..f1214549136f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/UpdateInputResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-2018-07-27/UpdateInput" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateInputResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     */
+    private InputConfiguration inputConfiguration;
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     * 
+     * @param inputConfiguration
+     *        Information about the configuration of the input.
+     */
+
+    public void setInputConfiguration(InputConfiguration inputConfiguration) {
+        this.inputConfiguration = inputConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     * 
+     * @return Information about the configuration of the input.
+     */
+
+    public InputConfiguration getInputConfiguration() {
+        return this.inputConfiguration;
+    }
+
+    /**
+     * <p>
+     * Information about the configuration of the input.
+     * </p>
+     * 
+     * @param inputConfiguration
+     *        Information about the configuration of the input.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateInputResult withInputConfiguration(InputConfiguration inputConfiguration) {
+        setInputConfiguration(inputConfiguration);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getInputConfiguration() != null)
+            sb.append("InputConfiguration: ").append(getInputConfiguration());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateInputResult == false)
+            return false;
+        UpdateInputResult other = (UpdateInputResult) obj;
+        if (other.getInputConfiguration() == null ^ this.getInputConfiguration() == null)
+            return false;
+        if (other.getInputConfiguration() != null && other.getInputConfiguration().equals(this.getInputConfiguration()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getInputConfiguration() == null) ? 0 : getInputConfiguration().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateInputResult clone() {
+        try {
+            return (UpdateInputResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..a4acff86f420
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ActionJsonUnmarshaller.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Action JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ActionJsonUnmarshaller implements Unmarshaller<Action, JsonUnmarshallerContext> {
+
+    public Action unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Action action = new Action();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("setVariable", targetDepth)) {
+                    context.nextToken();
+                    action.setSetVariable(SetVariableActionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("sns", targetDepth)) {
+                    context.nextToken();
+                    action.setSns(SNSTopicPublishActionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("iotTopicPublish", targetDepth)) {
+                    context.nextToken();
+                    action.setIotTopicPublish(IotTopicPublishActionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("setTimer", targetDepth)) {
+                    context.nextToken();
+                    action.setSetTimer(SetTimerActionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("clearTimer", targetDepth)) {
+                    context.nextToken();
+                    action.setClearTimer(ClearTimerActionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("resetTimer", targetDepth)) {
+                    context.nextToken();
+                    action.setResetTimer(ResetTimerActionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return action;
+    }
+
+    private static ActionJsonUnmarshaller instance;
+
+    public static ActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ActionMarshaller.java
new file mode 100644
index 000000000000..20aa5efe3271
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ActionMarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ActionMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> SETVARIABLE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("setVariable").build();
+    private static final MarshallingInfo<StructuredPojo> SNS_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("sns").build();
+    private static final MarshallingInfo<StructuredPojo> IOTTOPICPUBLISH_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("iotTopicPublish").build();
+    private static final MarshallingInfo<StructuredPojo> SETTIMER_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("setTimer").build();
+    private static final MarshallingInfo<StructuredPojo> CLEARTIMER_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clearTimer").build();
+    private static final MarshallingInfo<StructuredPojo> RESETTIMER_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resetTimer").build();
+
+    private static final ActionMarshaller instance = new ActionMarshaller();
+
+    public static ActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Action action, ProtocolMarshaller protocolMarshaller) {
+
+        if (action == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(action.getSetVariable(), SETVARIABLE_BINDING);
+            protocolMarshaller.marshall(action.getSns(), SNS_BINDING);
+            protocolMarshaller.marshall(action.getIotTopicPublish(), IOTTOPICPUBLISH_BINDING);
+            protocolMarshaller.marshall(action.getSetTimer(), SETTIMER_BINDING);
+            protocolMarshaller.marshall(action.getClearTimer(), CLEARTIMER_BINDING);
+            protocolMarshaller.marshall(action.getResetTimer(), RESETTIMER_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/AttributeJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/AttributeJsonUnmarshaller.java
new file mode 100644
index 000000000000..762afb26a852
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/AttributeJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Attribute JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AttributeJsonUnmarshaller implements Unmarshaller<Attribute, JsonUnmarshallerContext> {
+
+    public Attribute unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Attribute attribute = new Attribute();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("jsonPath", targetDepth)) {
+                    context.nextToken();
+                    attribute.setJsonPath(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return attribute;
+    }
+
+    private static AttributeJsonUnmarshaller instance;
+
+    public static AttributeJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new AttributeJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/AttributeMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/AttributeMarshaller.java
new file mode 100644
index 000000000000..1a89ffbdbfbc
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/AttributeMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * AttributeMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class AttributeMarshaller {
+
+    private static final MarshallingInfo<String> JSONPATH_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("jsonPath").build();
+
+    private static final AttributeMarshaller instance = new AttributeMarshaller();
+
+    public static AttributeMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Attribute attribute, ProtocolMarshaller protocolMarshaller) {
+
+        if (attribute == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(attribute.getJsonPath(), JSONPATH_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ClearTimerActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ClearTimerActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..7822c4687714
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ClearTimerActionJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ClearTimerAction JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ClearTimerActionJsonUnmarshaller implements Unmarshaller<ClearTimerAction, JsonUnmarshallerContext> {
+
+    public ClearTimerAction unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ClearTimerAction clearTimerAction = new ClearTimerAction();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("timerName", targetDepth)) {
+                    context.nextToken();
+                    clearTimerAction.setTimerName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return clearTimerAction;
+    }
+
+    private static ClearTimerActionJsonUnmarshaller instance;
+
+    public static ClearTimerActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ClearTimerActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ClearTimerActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ClearTimerActionMarshaller.java
new file mode 100644
index 000000000000..ee21b91687dc
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ClearTimerActionMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ClearTimerActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ClearTimerActionMarshaller {
+
+    private static final MarshallingInfo<String> TIMERNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("timerName").build();
+
+    private static final ClearTimerActionMarshaller instance = new ClearTimerActionMarshaller();
+
+    public static ClearTimerActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ClearTimerAction clearTimerAction, ProtocolMarshaller protocolMarshaller) {
+
+        if (clearTimerAction == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(clearTimerAction.getTimerName(), TIMERNAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelRequestMarshaller.java
new file mode 100644
index 000000000000..4315ced7a792
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelRequestMarshaller.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CreateDetectorModelRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CreateDetectorModelRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<StructuredPojo> DETECTORMODELDEFINITION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDefinition").build();
+    private static final MarshallingInfo<String> DETECTORMODELDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDescription").build();
+    private static final MarshallingInfo<String> KEY_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("key").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+    private static final MarshallingInfo<List> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
+
+    private static final CreateDetectorModelRequestMarshaller instance = new CreateDetectorModelRequestMarshaller();
+
+    public static CreateDetectorModelRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CreateDetectorModelRequest createDetectorModelRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (createDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(createDetectorModelRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(createDetectorModelRequest.getDetectorModelDefinition(), DETECTORMODELDEFINITION_BINDING);
+            protocolMarshaller.marshall(createDetectorModelRequest.getDetectorModelDescription(), DETECTORMODELDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(createDetectorModelRequest.getKey(), KEY_BINDING);
+            protocolMarshaller.marshall(createDetectorModelRequest.getRoleArn(), ROLEARN_BINDING);
+            protocolMarshaller.marshall(createDetectorModelRequest.getTags(), TAGS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..21784616c17e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CreateDetectorModelRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CreateDetectorModelRequestProtocolMarshaller implements Marshaller<Request<CreateDetectorModelRequest>, CreateDetectorModelRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/detector-models")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public CreateDetectorModelRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<CreateDetectorModelRequest> marshall(CreateDetectorModelRequest createDetectorModelRequest) {
+
+        if (createDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<CreateDetectorModelRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    createDetectorModelRequest);
+
+            protocolMarshaller.startMarshalling();
+            CreateDetectorModelRequestMarshaller.getInstance().marshall(createDetectorModelRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..adc854673c34
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateDetectorModelResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CreateDetectorModelResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CreateDetectorModelResultJsonUnmarshaller implements Unmarshaller<CreateDetectorModelResult, JsonUnmarshallerContext> {
+
+    public CreateDetectorModelResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CreateDetectorModelResult createDetectorModelResult = new CreateDetectorModelResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return createDetectorModelResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelConfiguration", targetDepth)) {
+                    context.nextToken();
+                    createDetectorModelResult.setDetectorModelConfiguration(DetectorModelConfigurationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return createDetectorModelResult;
+    }
+
+    private static CreateDetectorModelResultJsonUnmarshaller instance;
+
+    public static CreateDetectorModelResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CreateDetectorModelResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputRequestMarshaller.java
new file mode 100644
index 000000000000..4e0a39bfd760
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputRequestMarshaller.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CreateInputRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CreateInputRequestMarshaller {
+
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("inputName").build();
+    private static final MarshallingInfo<String> INPUTDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDescription").build();
+    private static final MarshallingInfo<StructuredPojo> INPUTDEFINITION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDefinition").build();
+    private static final MarshallingInfo<List> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
+
+    private static final CreateInputRequestMarshaller instance = new CreateInputRequestMarshaller();
+
+    public static CreateInputRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CreateInputRequest createInputRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (createInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(createInputRequest.getInputName(), INPUTNAME_BINDING);
+            protocolMarshaller.marshall(createInputRequest.getInputDescription(), INPUTDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(createInputRequest.getInputDefinition(), INPUTDEFINITION_BINDING);
+            protocolMarshaller.marshall(createInputRequest.getTags(), TAGS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..3d22d1488b45
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CreateInputRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CreateInputRequestProtocolMarshaller implements Marshaller<Request<CreateInputRequest>, CreateInputRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/inputs")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public CreateInputRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<CreateInputRequest> marshall(CreateInputRequest createInputRequest) {
+
+        if (createInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<CreateInputRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    createInputRequest);
+
+            protocolMarshaller.startMarshalling();
+            CreateInputRequestMarshaller.getInstance().marshall(createInputRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..2992a3f1b6b3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/CreateInputResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CreateInputResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CreateInputResultJsonUnmarshaller implements Unmarshaller<CreateInputResult, JsonUnmarshallerContext> {
+
+    public CreateInputResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CreateInputResult createInputResult = new CreateInputResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return createInputResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("inputConfiguration", targetDepth)) {
+                    context.nextToken();
+                    createInputResult.setInputConfiguration(InputConfigurationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return createInputResult;
+    }
+
+    private static CreateInputResultJsonUnmarshaller instance;
+
+    public static CreateInputResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CreateInputResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelRequestMarshaller.java
new file mode 100644
index 000000000000..27b5c5ffef4a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelRequestMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DeleteDetectorModelRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DeleteDetectorModelRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("detectorModelName").build();
+
+    private static final DeleteDetectorModelRequestMarshaller instance = new DeleteDetectorModelRequestMarshaller();
+
+    public static DeleteDetectorModelRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DeleteDetectorModelRequest deleteDetectorModelRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (deleteDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(deleteDetectorModelRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..4fb1770e12e0
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DeleteDetectorModelRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DeleteDetectorModelRequestProtocolMarshaller implements Marshaller<Request<DeleteDetectorModelRequest>, DeleteDetectorModelRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/detector-models/{detectorModelName}").httpMethodName(HttpMethodName.DELETE).hasExplicitPayloadMember(false).hasPayloadMembers(false)
+            .serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DeleteDetectorModelRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DeleteDetectorModelRequest> marshall(DeleteDetectorModelRequest deleteDetectorModelRequest) {
+
+        if (deleteDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DeleteDetectorModelRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    deleteDetectorModelRequest);
+
+            protocolMarshaller.startMarshalling();
+            DeleteDetectorModelRequestMarshaller.getInstance().marshall(deleteDetectorModelRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..669a49dd4b0c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteDetectorModelResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DeleteDetectorModelResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DeleteDetectorModelResultJsonUnmarshaller implements Unmarshaller<DeleteDetectorModelResult, JsonUnmarshallerContext> {
+
+    public DeleteDetectorModelResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DeleteDetectorModelResult deleteDetectorModelResult = new DeleteDetectorModelResult();
+
+        return deleteDetectorModelResult;
+    }
+
+    private static DeleteDetectorModelResultJsonUnmarshaller instance;
+
+    public static DeleteDetectorModelResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DeleteDetectorModelResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputRequestMarshaller.java
new file mode 100644
index 000000000000..912fc52b9727
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputRequestMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DeleteInputRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DeleteInputRequestMarshaller {
+
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("inputName").build();
+
+    private static final DeleteInputRequestMarshaller instance = new DeleteInputRequestMarshaller();
+
+    public static DeleteInputRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DeleteInputRequest deleteInputRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (deleteInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(deleteInputRequest.getInputName(), INPUTNAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..7dcf845b269f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DeleteInputRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DeleteInputRequestProtocolMarshaller implements Marshaller<Request<DeleteInputRequest>, DeleteInputRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/inputs/{inputName}")
+            .httpMethodName(HttpMethodName.DELETE).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DeleteInputRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DeleteInputRequest> marshall(DeleteInputRequest deleteInputRequest) {
+
+        if (deleteInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DeleteInputRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    deleteInputRequest);
+
+            protocolMarshaller.startMarshalling();
+            DeleteInputRequestMarshaller.getInstance().marshall(deleteInputRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..f4a602826259
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DeleteInputResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DeleteInputResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DeleteInputResultJsonUnmarshaller implements Unmarshaller<DeleteInputResult, JsonUnmarshallerContext> {
+
+    public DeleteInputResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DeleteInputResult deleteInputResult = new DeleteInputResult();
+
+        return deleteInputResult;
+    }
+
+    private static DeleteInputResultJsonUnmarshaller instance;
+
+    public static DeleteInputResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DeleteInputResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelRequestMarshaller.java
new file mode 100644
index 000000000000..03e02ff78d2b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelRequestMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeDetectorModelRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeDetectorModelRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> DETECTORMODELVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("version").build();
+
+    private static final DescribeDetectorModelRequestMarshaller instance = new DescribeDetectorModelRequestMarshaller();
+
+    public static DescribeDetectorModelRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DescribeDetectorModelRequest describeDetectorModelRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (describeDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(describeDetectorModelRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(describeDetectorModelRequest.getDetectorModelVersion(), DETECTORMODELVERSION_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..689096cbc0a8
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeDetectorModelRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeDetectorModelRequestProtocolMarshaller implements Marshaller<Request<DescribeDetectorModelRequest>, DescribeDetectorModelRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/detector-models/{detectorModelName}").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false)
+            .serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DescribeDetectorModelRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DescribeDetectorModelRequest> marshall(DescribeDetectorModelRequest describeDetectorModelRequest) {
+
+        if (describeDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DescribeDetectorModelRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    describeDetectorModelRequest);
+
+            protocolMarshaller.startMarshalling();
+            DescribeDetectorModelRequestMarshaller.getInstance().marshall(describeDetectorModelRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..a8b436301e0e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeDetectorModelResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DescribeDetectorModelResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeDetectorModelResultJsonUnmarshaller implements Unmarshaller<DescribeDetectorModelResult, JsonUnmarshallerContext> {
+
+    public DescribeDetectorModelResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DescribeDetectorModelResult describeDetectorModelResult = new DescribeDetectorModelResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return describeDetectorModelResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModel", targetDepth)) {
+                    context.nextToken();
+                    describeDetectorModelResult.setDetectorModel(DetectorModelJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return describeDetectorModelResult;
+    }
+
+    private static DescribeDetectorModelResultJsonUnmarshaller instance;
+
+    public static DescribeDetectorModelResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DescribeDetectorModelResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputRequestMarshaller.java
new file mode 100644
index 000000000000..216820437c0f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputRequestMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeInputRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeInputRequestMarshaller {
+
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("inputName").build();
+
+    private static final DescribeInputRequestMarshaller instance = new DescribeInputRequestMarshaller();
+
+    public static DescribeInputRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DescribeInputRequest describeInputRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (describeInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(describeInputRequest.getInputName(), INPUTNAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..44ef339efe33
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeInputRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeInputRequestProtocolMarshaller implements Marshaller<Request<DescribeInputRequest>, DescribeInputRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/inputs/{inputName}")
+            .httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DescribeInputRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DescribeInputRequest> marshall(DescribeInputRequest describeInputRequest) {
+
+        if (describeInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DescribeInputRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    describeInputRequest);
+
+            protocolMarshaller.startMarshalling();
+            DescribeInputRequestMarshaller.getInstance().marshall(describeInputRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..8916ada8f2ca
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeInputResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DescribeInputResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeInputResultJsonUnmarshaller implements Unmarshaller<DescribeInputResult, JsonUnmarshallerContext> {
+
+    public DescribeInputResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DescribeInputResult describeInputResult = new DescribeInputResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return describeInputResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("input", targetDepth)) {
+                    context.nextToken();
+                    describeInputResult.setInput(InputJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return describeInputResult;
+    }
+
+    private static DescribeInputResultJsonUnmarshaller instance;
+
+    public static DescribeInputResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DescribeInputResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsRequestMarshaller.java
new file mode 100644
index 000000000000..2f1f2dba36ed
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsRequestMarshaller.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeLoggingOptionsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeLoggingOptionsRequestMarshaller {
+
+    private static final DescribeLoggingOptionsRequestMarshaller instance = new DescribeLoggingOptionsRequestMarshaller();
+
+    public static DescribeLoggingOptionsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DescribeLoggingOptionsRequest describeLoggingOptionsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (describeLoggingOptionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..73965ab81807
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeLoggingOptionsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeLoggingOptionsRequestProtocolMarshaller implements Marshaller<Request<DescribeLoggingOptionsRequest>, DescribeLoggingOptionsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/logging")
+            .httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DescribeLoggingOptionsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DescribeLoggingOptionsRequest> marshall(DescribeLoggingOptionsRequest describeLoggingOptionsRequest) {
+
+        if (describeLoggingOptionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DescribeLoggingOptionsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    describeLoggingOptionsRequest);
+
+            protocolMarshaller.startMarshalling();
+            DescribeLoggingOptionsRequestMarshaller.getInstance().marshall(describeLoggingOptionsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..3bd1f6c62ccc
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DescribeLoggingOptionsResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DescribeLoggingOptionsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeLoggingOptionsResultJsonUnmarshaller implements Unmarshaller<DescribeLoggingOptionsResult, JsonUnmarshallerContext> {
+
+    public DescribeLoggingOptionsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DescribeLoggingOptionsResult describeLoggingOptionsResult = new DescribeLoggingOptionsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return describeLoggingOptionsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("loggingOptions", targetDepth)) {
+                    context.nextToken();
+                    describeLoggingOptionsResult.setLoggingOptions(LoggingOptionsJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return describeLoggingOptionsResult;
+    }
+
+    private static DescribeLoggingOptionsResultJsonUnmarshaller instance;
+
+    public static DescribeLoggingOptionsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DescribeLoggingOptionsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorDebugOptionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorDebugOptionJsonUnmarshaller.java
new file mode 100644
index 000000000000..f46b98ce4bc5
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorDebugOptionJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorDebugOption JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorDebugOptionJsonUnmarshaller implements Unmarshaller<DetectorDebugOption, JsonUnmarshallerContext> {
+
+    public DetectorDebugOption unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorDebugOption detectorDebugOption = new DetectorDebugOption();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    detectorDebugOption.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyValue", targetDepth)) {
+                    context.nextToken();
+                    detectorDebugOption.setKeyValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorDebugOption;
+    }
+
+    private static DetectorDebugOptionJsonUnmarshaller instance;
+
+    public static DetectorDebugOptionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorDebugOptionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorDebugOptionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorDebugOptionMarshaller.java
new file mode 100644
index 000000000000..ee028914d13b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorDebugOptionMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorDebugOptionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorDebugOptionMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> KEYVALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyValue").build();
+
+    private static final DetectorDebugOptionMarshaller instance = new DetectorDebugOptionMarshaller();
+
+    public static DetectorDebugOptionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorDebugOption detectorDebugOption, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorDebugOption == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorDebugOption.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(detectorDebugOption.getKeyValue(), KEYVALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelConfigurationJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelConfigurationJsonUnmarshaller.java
new file mode 100644
index 000000000000..fa5bb06ffb73
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelConfigurationJsonUnmarshaller.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorModelConfiguration JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelConfigurationJsonUnmarshaller implements Unmarshaller<DetectorModelConfiguration, JsonUnmarshallerContext> {
+
+    public DetectorModelConfiguration unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorModelConfiguration detectorModelConfiguration = new DetectorModelConfiguration();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelVersion", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setDetectorModelVersion(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelDescription", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setDetectorModelDescription(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelArn", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setDetectorModelArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("lastUpdateTime", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setLastUpdateTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("status", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("key", targetDepth)) {
+                    context.nextToken();
+                    detectorModelConfiguration.setKey(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorModelConfiguration;
+    }
+
+    private static DetectorModelConfigurationJsonUnmarshaller instance;
+
+    public static DetectorModelConfigurationJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorModelConfigurationJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelConfigurationMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelConfigurationMarshaller.java
new file mode 100644
index 000000000000..90c83f04fb75
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelConfigurationMarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorModelConfigurationMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorModelConfigurationMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> DETECTORMODELVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelVersion").build();
+    private static final MarshallingInfo<String> DETECTORMODELDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDescription").build();
+    private static final MarshallingInfo<String> DETECTORMODELARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelArn").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<java.util.Date> LASTUPDATETIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("lastUpdateTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("status").build();
+    private static final MarshallingInfo<String> KEY_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("key").build();
+
+    private static final DetectorModelConfigurationMarshaller instance = new DetectorModelConfigurationMarshaller();
+
+    public static DetectorModelConfigurationMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorModelConfiguration detectorModelConfiguration, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorModelConfiguration == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorModelConfiguration.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getDetectorModelVersion(), DETECTORMODELVERSION_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getDetectorModelDescription(), DETECTORMODELDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getDetectorModelArn(), DETECTORMODELARN_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getRoleArn(), ROLEARN_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getLastUpdateTime(), LASTUPDATETIME_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getStatus(), STATUS_BINDING);
+            protocolMarshaller.marshall(detectorModelConfiguration.getKey(), KEY_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelDefinitionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelDefinitionJsonUnmarshaller.java
new file mode 100644
index 000000000000..2a773cdbf315
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelDefinitionJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorModelDefinition JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelDefinitionJsonUnmarshaller implements Unmarshaller<DetectorModelDefinition, JsonUnmarshallerContext> {
+
+    public DetectorModelDefinition unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorModelDefinition detectorModelDefinition = new DetectorModelDefinition();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("states", targetDepth)) {
+                    context.nextToken();
+                    detectorModelDefinition.setStates(new ListUnmarshaller<State>(StateJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("initialStateName", targetDepth)) {
+                    context.nextToken();
+                    detectorModelDefinition.setInitialStateName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorModelDefinition;
+    }
+
+    private static DetectorModelDefinitionJsonUnmarshaller instance;
+
+    public static DetectorModelDefinitionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorModelDefinitionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelDefinitionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelDefinitionMarshaller.java
new file mode 100644
index 000000000000..3355df7caba4
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelDefinitionMarshaller.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorModelDefinitionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorModelDefinitionMarshaller {
+
+    private static final MarshallingInfo<List> STATES_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("states").build();
+    private static final MarshallingInfo<String> INITIALSTATENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("initialStateName").build();
+
+    private static final DetectorModelDefinitionMarshaller instance = new DetectorModelDefinitionMarshaller();
+
+    public static DetectorModelDefinitionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorModelDefinition detectorModelDefinition, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorModelDefinition == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorModelDefinition.getStates(), STATES_BINDING);
+            protocolMarshaller.marshall(detectorModelDefinition.getInitialStateName(), INITIALSTATENAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelJsonUnmarshaller.java
new file mode 100644
index 000000000000..7775faa94dca
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorModel JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelJsonUnmarshaller implements Unmarshaller<DetectorModel, JsonUnmarshallerContext> {
+
+    public DetectorModel unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorModel detectorModel = new DetectorModel();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelDefinition", targetDepth)) {
+                    context.nextToken();
+                    detectorModel.setDetectorModelDefinition(DetectorModelDefinitionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("detectorModelConfiguration", targetDepth)) {
+                    context.nextToken();
+                    detectorModel.setDetectorModelConfiguration(DetectorModelConfigurationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorModel;
+    }
+
+    private static DetectorModelJsonUnmarshaller instance;
+
+    public static DetectorModelJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorModelJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelMarshaller.java
new file mode 100644
index 000000000000..f6084599c27a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorModelMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorModelMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> DETECTORMODELDEFINITION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDefinition").build();
+    private static final MarshallingInfo<StructuredPojo> DETECTORMODELCONFIGURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelConfiguration").build();
+
+    private static final DetectorModelMarshaller instance = new DetectorModelMarshaller();
+
+    public static DetectorModelMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorModel detectorModel, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorModel == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorModel.getDetectorModelDefinition(), DETECTORMODELDEFINITION_BINDING);
+            protocolMarshaller.marshall(detectorModel.getDetectorModelConfiguration(), DETECTORMODELCONFIGURATION_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelSummaryJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..73d4b62f92e4
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelSummaryJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorModelSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelSummaryJsonUnmarshaller implements Unmarshaller<DetectorModelSummary, JsonUnmarshallerContext> {
+
+    public DetectorModelSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorModelSummary detectorModelSummary = new DetectorModelSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    detectorModelSummary.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelDescription", targetDepth)) {
+                    context.nextToken();
+                    detectorModelSummary.setDetectorModelDescription(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    detectorModelSummary.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorModelSummary;
+    }
+
+    private static DetectorModelSummaryJsonUnmarshaller instance;
+
+    public static DetectorModelSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorModelSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelSummaryMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelSummaryMarshaller.java
new file mode 100644
index 000000000000..ba8722f6235f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelSummaryMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorModelSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorModelSummaryMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> DETECTORMODELDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDescription").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+
+    private static final DetectorModelSummaryMarshaller instance = new DetectorModelSummaryMarshaller();
+
+    public static DetectorModelSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorModelSummary detectorModelSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorModelSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorModelSummary.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(detectorModelSummary.getDetectorModelDescription(), DETECTORMODELDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(detectorModelSummary.getCreationTime(), CREATIONTIME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelVersionSummaryJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelVersionSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..2011670e7f28
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelVersionSummaryJsonUnmarshaller.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorModelVersionSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorModelVersionSummaryJsonUnmarshaller implements Unmarshaller<DetectorModelVersionSummary, JsonUnmarshallerContext> {
+
+    public DetectorModelVersionSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorModelVersionSummary detectorModelVersionSummary = new DetectorModelVersionSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelVersion", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setDetectorModelVersion(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelArn", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setDetectorModelArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("lastUpdateTime", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setLastUpdateTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("status", targetDepth)) {
+                    context.nextToken();
+                    detectorModelVersionSummary.setStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorModelVersionSummary;
+    }
+
+    private static DetectorModelVersionSummaryJsonUnmarshaller instance;
+
+    public static DetectorModelVersionSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorModelVersionSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelVersionSummaryMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelVersionSummaryMarshaller.java
new file mode 100644
index 000000000000..59ab67ddfe8b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/DetectorModelVersionSummaryMarshaller.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorModelVersionSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorModelVersionSummaryMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> DETECTORMODELVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelVersion").build();
+    private static final MarshallingInfo<String> DETECTORMODELARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelArn").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<java.util.Date> LASTUPDATETIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("lastUpdateTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("status").build();
+
+    private static final DetectorModelVersionSummaryMarshaller instance = new DetectorModelVersionSummaryMarshaller();
+
+    public static DetectorModelVersionSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorModelVersionSummary detectorModelVersionSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorModelVersionSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorModelVersionSummary.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(detectorModelVersionSummary.getDetectorModelVersion(), DETECTORMODELVERSION_BINDING);
+            protocolMarshaller.marshall(detectorModelVersionSummary.getDetectorModelArn(), DETECTORMODELARN_BINDING);
+            protocolMarshaller.marshall(detectorModelVersionSummary.getRoleArn(), ROLEARN_BINDING);
+            protocolMarshaller.marshall(detectorModelVersionSummary.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(detectorModelVersionSummary.getLastUpdateTime(), LASTUPDATETIME_BINDING);
+            protocolMarshaller.marshall(detectorModelVersionSummary.getStatus(), STATUS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/EventJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/EventJsonUnmarshaller.java
new file mode 100644
index 000000000000..52ce857d5845
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/EventJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Event JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class EventJsonUnmarshaller implements Unmarshaller<Event, JsonUnmarshallerContext> {
+
+    public Event unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Event event = new Event();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("eventName", targetDepth)) {
+                    context.nextToken();
+                    event.setEventName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("condition", targetDepth)) {
+                    context.nextToken();
+                    event.setCondition(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("actions", targetDepth)) {
+                    context.nextToken();
+                    event.setActions(new ListUnmarshaller<Action>(ActionJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return event;
+    }
+
+    private static EventJsonUnmarshaller instance;
+
+    public static EventJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new EventJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/EventMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/EventMarshaller.java
new file mode 100644
index 000000000000..659a8ad962c7
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/EventMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * EventMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class EventMarshaller {
+
+    private static final MarshallingInfo<String> EVENTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("eventName").build();
+    private static final MarshallingInfo<String> CONDITION_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("condition").build();
+    private static final MarshallingInfo<List> ACTIONS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("actions").build();
+
+    private static final EventMarshaller instance = new EventMarshaller();
+
+    public static EventMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Event event, ProtocolMarshaller protocolMarshaller) {
+
+        if (event == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(event.getEventName(), EVENTNAME_BINDING);
+            protocolMarshaller.marshall(event.getCondition(), CONDITION_BINDING);
+            protocolMarshaller.marshall(event.getActions(), ACTIONS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputConfigurationJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputConfigurationJsonUnmarshaller.java
new file mode 100644
index 000000000000..84a1d4b7dd6e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputConfigurationJsonUnmarshaller.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * InputConfiguration JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputConfigurationJsonUnmarshaller implements Unmarshaller<InputConfiguration, JsonUnmarshallerContext> {
+
+    public InputConfiguration unmarshall(JsonUnmarshallerContext context) throws Exception {
+        InputConfiguration inputConfiguration = new InputConfiguration();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("inputName", targetDepth)) {
+                    context.nextToken();
+                    inputConfiguration.setInputName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("inputDescription", targetDepth)) {
+                    context.nextToken();
+                    inputConfiguration.setInputDescription(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("inputArn", targetDepth)) {
+                    context.nextToken();
+                    inputConfiguration.setInputArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    inputConfiguration.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("lastUpdateTime", targetDepth)) {
+                    context.nextToken();
+                    inputConfiguration.setLastUpdateTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("status", targetDepth)) {
+                    context.nextToken();
+                    inputConfiguration.setStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return inputConfiguration;
+    }
+
+    private static InputConfigurationJsonUnmarshaller instance;
+
+    public static InputConfigurationJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new InputConfigurationJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputConfigurationMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputConfigurationMarshaller.java
new file mode 100644
index 000000000000..88beb27742b0
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputConfigurationMarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * InputConfigurationMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class InputConfigurationMarshaller {
+
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("inputName").build();
+    private static final MarshallingInfo<String> INPUTDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDescription").build();
+    private static final MarshallingInfo<String> INPUTARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("inputArn").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<java.util.Date> LASTUPDATETIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("lastUpdateTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("status").build();
+
+    private static final InputConfigurationMarshaller instance = new InputConfigurationMarshaller();
+
+    public static InputConfigurationMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(InputConfiguration inputConfiguration, ProtocolMarshaller protocolMarshaller) {
+
+        if (inputConfiguration == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(inputConfiguration.getInputName(), INPUTNAME_BINDING);
+            protocolMarshaller.marshall(inputConfiguration.getInputDescription(), INPUTDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(inputConfiguration.getInputArn(), INPUTARN_BINDING);
+            protocolMarshaller.marshall(inputConfiguration.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(inputConfiguration.getLastUpdateTime(), LASTUPDATETIME_BINDING);
+            protocolMarshaller.marshall(inputConfiguration.getStatus(), STATUS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputDefinitionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputDefinitionJsonUnmarshaller.java
new file mode 100644
index 000000000000..080569c06968
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputDefinitionJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * InputDefinition JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputDefinitionJsonUnmarshaller implements Unmarshaller<InputDefinition, JsonUnmarshallerContext> {
+
+    public InputDefinition unmarshall(JsonUnmarshallerContext context) throws Exception {
+        InputDefinition inputDefinition = new InputDefinition();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("attributes", targetDepth)) {
+                    context.nextToken();
+                    inputDefinition.setAttributes(new ListUnmarshaller<Attribute>(AttributeJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return inputDefinition;
+    }
+
+    private static InputDefinitionJsonUnmarshaller instance;
+
+    public static InputDefinitionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new InputDefinitionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputDefinitionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputDefinitionMarshaller.java
new file mode 100644
index 000000000000..afa6d4c97044
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputDefinitionMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * InputDefinitionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class InputDefinitionMarshaller {
+
+    private static final MarshallingInfo<List> ATTRIBUTES_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("attributes").build();
+
+    private static final InputDefinitionMarshaller instance = new InputDefinitionMarshaller();
+
+    public static InputDefinitionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(InputDefinition inputDefinition, ProtocolMarshaller protocolMarshaller) {
+
+        if (inputDefinition == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(inputDefinition.getAttributes(), ATTRIBUTES_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputJsonUnmarshaller.java
new file mode 100644
index 000000000000..4e6992505595
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Input JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputJsonUnmarshaller implements Unmarshaller<Input, JsonUnmarshallerContext> {
+
+    public Input unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Input input = new Input();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("inputConfiguration", targetDepth)) {
+                    context.nextToken();
+                    input.setInputConfiguration(InputConfigurationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("inputDefinition", targetDepth)) {
+                    context.nextToken();
+                    input.setInputDefinition(InputDefinitionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return input;
+    }
+
+    private static InputJsonUnmarshaller instance;
+
+    public static InputJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new InputJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputMarshaller.java
new file mode 100644
index 000000000000..daea813544f8
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * InputMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class InputMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> INPUTCONFIGURATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputConfiguration").build();
+    private static final MarshallingInfo<StructuredPojo> INPUTDEFINITION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDefinition").build();
+
+    private static final InputMarshaller instance = new InputMarshaller();
+
+    public static InputMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Input input, ProtocolMarshaller protocolMarshaller) {
+
+        if (input == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(input.getInputConfiguration(), INPUTCONFIGURATION_BINDING);
+            protocolMarshaller.marshall(input.getInputDefinition(), INPUTDEFINITION_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputSummaryJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..8774d7e96fc3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputSummaryJsonUnmarshaller.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * InputSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InputSummaryJsonUnmarshaller implements Unmarshaller<InputSummary, JsonUnmarshallerContext> {
+
+    public InputSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        InputSummary inputSummary = new InputSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("inputName", targetDepth)) {
+                    context.nextToken();
+                    inputSummary.setInputName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("inputDescription", targetDepth)) {
+                    context.nextToken();
+                    inputSummary.setInputDescription(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("inputArn", targetDepth)) {
+                    context.nextToken();
+                    inputSummary.setInputArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    inputSummary.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("lastUpdateTime", targetDepth)) {
+                    context.nextToken();
+                    inputSummary.setLastUpdateTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("status", targetDepth)) {
+                    context.nextToken();
+                    inputSummary.setStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return inputSummary;
+    }
+
+    private static InputSummaryJsonUnmarshaller instance;
+
+    public static InputSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new InputSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputSummaryMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputSummaryMarshaller.java
new file mode 100644
index 000000000000..52fd3230f1b9
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/InputSummaryMarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * InputSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class InputSummaryMarshaller {
+
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("inputName").build();
+    private static final MarshallingInfo<String> INPUTDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDescription").build();
+    private static final MarshallingInfo<String> INPUTARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("inputArn").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<java.util.Date> LASTUPDATETIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("lastUpdateTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<String> STATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("status").build();
+
+    private static final InputSummaryMarshaller instance = new InputSummaryMarshaller();
+
+    public static InputSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(InputSummary inputSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (inputSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(inputSummary.getInputName(), INPUTNAME_BINDING);
+            protocolMarshaller.marshall(inputSummary.getInputDescription(), INPUTDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(inputSummary.getInputArn(), INPUTARN_BINDING);
+            protocolMarshaller.marshall(inputSummary.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(inputSummary.getLastUpdateTime(), LASTUPDATETIME_BINDING);
+            protocolMarshaller.marshall(inputSummary.getStatus(), STATUS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/IotTopicPublishActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/IotTopicPublishActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..c1c85ed5ee45
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/IotTopicPublishActionJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * IotTopicPublishAction JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class IotTopicPublishActionJsonUnmarshaller implements Unmarshaller<IotTopicPublishAction, JsonUnmarshallerContext> {
+
+    public IotTopicPublishAction unmarshall(JsonUnmarshallerContext context) throws Exception {
+        IotTopicPublishAction iotTopicPublishAction = new IotTopicPublishAction();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("mqttTopic", targetDepth)) {
+                    context.nextToken();
+                    iotTopicPublishAction.setMqttTopic(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return iotTopicPublishAction;
+    }
+
+    private static IotTopicPublishActionJsonUnmarshaller instance;
+
+    public static IotTopicPublishActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new IotTopicPublishActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/IotTopicPublishActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/IotTopicPublishActionMarshaller.java
new file mode 100644
index 000000000000..d6efc525513e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/IotTopicPublishActionMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * IotTopicPublishActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class IotTopicPublishActionMarshaller {
+
+    private static final MarshallingInfo<String> MQTTTOPIC_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("mqttTopic").build();
+
+    private static final IotTopicPublishActionMarshaller instance = new IotTopicPublishActionMarshaller();
+
+    public static IotTopicPublishActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(IotTopicPublishAction iotTopicPublishAction, ProtocolMarshaller protocolMarshaller) {
+
+        if (iotTopicPublishAction == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(iotTopicPublishAction.getMqttTopic(), MQTTTOPIC_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsRequestMarshaller.java
new file mode 100644
index 000000000000..3eeb4644eb8e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListDetectorModelVersionsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListDetectorModelVersionsRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
+
+    private static final ListDetectorModelVersionsRequestMarshaller instance = new ListDetectorModelVersionsRequestMarshaller();
+
+    public static ListDetectorModelVersionsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListDetectorModelVersionsRequest listDetectorModelVersionsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listDetectorModelVersionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listDetectorModelVersionsRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(listDetectorModelVersionsRequest.getNextToken(), NEXTTOKEN_BINDING);
+            protocolMarshaller.marshall(listDetectorModelVersionsRequest.getMaxResults(), MAXRESULTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..6e9d643846ab
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsRequestProtocolMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListDetectorModelVersionsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListDetectorModelVersionsRequestProtocolMarshaller implements
+        Marshaller<Request<ListDetectorModelVersionsRequest>, ListDetectorModelVersionsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/detector-models/{detectorModelName}/versions").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false)
+            .hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListDetectorModelVersionsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListDetectorModelVersionsRequest> marshall(ListDetectorModelVersionsRequest listDetectorModelVersionsRequest) {
+
+        if (listDetectorModelVersionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListDetectorModelVersionsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(
+                    SDK_OPERATION_BINDING, listDetectorModelVersionsRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListDetectorModelVersionsRequestMarshaller.getInstance().marshall(listDetectorModelVersionsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..668db9d400da
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelVersionsResultJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListDetectorModelVersionsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorModelVersionsResultJsonUnmarshaller implements Unmarshaller<ListDetectorModelVersionsResult, JsonUnmarshallerContext> {
+
+    public ListDetectorModelVersionsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListDetectorModelVersionsResult listDetectorModelVersionsResult = new ListDetectorModelVersionsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listDetectorModelVersionsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelVersionSummaries", targetDepth)) {
+                    context.nextToken();
+                    listDetectorModelVersionsResult.setDetectorModelVersionSummaries(new ListUnmarshaller<DetectorModelVersionSummary>(
+                            DetectorModelVersionSummaryJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listDetectorModelVersionsResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listDetectorModelVersionsResult;
+    }
+
+    private static ListDetectorModelVersionsResultJsonUnmarshaller instance;
+
+    public static ListDetectorModelVersionsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListDetectorModelVersionsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsRequestMarshaller.java
new file mode 100644
index 000000000000..78cd9c73dcda
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsRequestMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListDetectorModelsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListDetectorModelsRequestMarshaller {
+
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
+
+    private static final ListDetectorModelsRequestMarshaller instance = new ListDetectorModelsRequestMarshaller();
+
+    public static ListDetectorModelsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListDetectorModelsRequest listDetectorModelsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listDetectorModelsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listDetectorModelsRequest.getNextToken(), NEXTTOKEN_BINDING);
+            protocolMarshaller.marshall(listDetectorModelsRequest.getMaxResults(), MAXRESULTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..3fbfcc6d7915
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListDetectorModelsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListDetectorModelsRequestProtocolMarshaller implements Marshaller<Request<ListDetectorModelsRequest>, ListDetectorModelsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/detector-models")
+            .httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListDetectorModelsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListDetectorModelsRequest> marshall(ListDetectorModelsRequest listDetectorModelsRequest) {
+
+        if (listDetectorModelsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListDetectorModelsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    listDetectorModelsRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListDetectorModelsRequestMarshaller.getInstance().marshall(listDetectorModelsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..c37bffa09770
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListDetectorModelsResultJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListDetectorModelsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorModelsResultJsonUnmarshaller implements Unmarshaller<ListDetectorModelsResult, JsonUnmarshallerContext> {
+
+    public ListDetectorModelsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListDetectorModelsResult listDetectorModelsResult = new ListDetectorModelsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listDetectorModelsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelSummaries", targetDepth)) {
+                    context.nextToken();
+                    listDetectorModelsResult.setDetectorModelSummaries(new ListUnmarshaller<DetectorModelSummary>(DetectorModelSummaryJsonUnmarshaller
+                            .getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listDetectorModelsResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listDetectorModelsResult;
+    }
+
+    private static ListDetectorModelsResultJsonUnmarshaller instance;
+
+    public static ListDetectorModelsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListDetectorModelsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsRequestMarshaller.java
new file mode 100644
index 000000000000..1b4877de4095
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsRequestMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListInputsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListInputsRequestMarshaller {
+
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
+
+    private static final ListInputsRequestMarshaller instance = new ListInputsRequestMarshaller();
+
+    public static ListInputsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListInputsRequest listInputsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listInputsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listInputsRequest.getNextToken(), NEXTTOKEN_BINDING);
+            protocolMarshaller.marshall(listInputsRequest.getMaxResults(), MAXRESULTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..71cbb96a4928
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListInputsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListInputsRequestProtocolMarshaller implements Marshaller<Request<ListInputsRequest>, ListInputsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/inputs")
+            .httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListInputsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListInputsRequest> marshall(ListInputsRequest listInputsRequest) {
+
+        if (listInputsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListInputsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    listInputsRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListInputsRequestMarshaller.getInstance().marshall(listInputsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..dc21b0f3cb98
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListInputsResultJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListInputsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListInputsResultJsonUnmarshaller implements Unmarshaller<ListInputsResult, JsonUnmarshallerContext> {
+
+    public ListInputsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListInputsResult listInputsResult = new ListInputsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listInputsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("inputSummaries", targetDepth)) {
+                    context.nextToken();
+                    listInputsResult.setInputSummaries(new ListUnmarshaller<InputSummary>(InputSummaryJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listInputsResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listInputsResult;
+    }
+
+    private static ListInputsResultJsonUnmarshaller instance;
+
+    public static ListInputsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListInputsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceRequestMarshaller.java
new file mode 100644
index 000000000000..786365d37fb2
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceRequestMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListTagsForResourceRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListTagsForResourceRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("resourceArn").build();
+
+    private static final ListTagsForResourceRequestMarshaller instance = new ListTagsForResourceRequestMarshaller();
+
+    public static ListTagsForResourceRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListTagsForResourceRequest listTagsForResourceRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listTagsForResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listTagsForResourceRequest.getResourceArn(), RESOURCEARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..d2c0bb280ba9
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListTagsForResourceRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListTagsForResourceRequestProtocolMarshaller implements Marshaller<Request<ListTagsForResourceRequest>, ListTagsForResourceRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/tags")
+            .httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListTagsForResourceRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListTagsForResourceRequest> marshall(ListTagsForResourceRequest listTagsForResourceRequest) {
+
+        if (listTagsForResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListTagsForResourceRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    listTagsForResourceRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListTagsForResourceRequestMarshaller.getInstance().marshall(listTagsForResourceRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..ddbe0835d396
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ListTagsForResourceResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListTagsForResourceResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListTagsForResourceResultJsonUnmarshaller implements Unmarshaller<ListTagsForResourceResult, JsonUnmarshallerContext> {
+
+    public ListTagsForResourceResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListTagsForResourceResult listTagsForResourceResult = new ListTagsForResourceResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listTagsForResourceResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("tags", targetDepth)) {
+                    context.nextToken();
+                    listTagsForResourceResult.setTags(new ListUnmarshaller<Tag>(TagJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listTagsForResourceResult;
+    }
+
+    private static ListTagsForResourceResultJsonUnmarshaller instance;
+
+    public static ListTagsForResourceResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListTagsForResourceResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/LoggingOptionsJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/LoggingOptionsJsonUnmarshaller.java
new file mode 100644
index 000000000000..3d3674f0f86f
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/LoggingOptionsJsonUnmarshaller.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * LoggingOptions JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class LoggingOptionsJsonUnmarshaller implements Unmarshaller<LoggingOptions, JsonUnmarshallerContext> {
+
+    public LoggingOptions unmarshall(JsonUnmarshallerContext context) throws Exception {
+        LoggingOptions loggingOptions = new LoggingOptions();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("roleArn", targetDepth)) {
+                    context.nextToken();
+                    loggingOptions.setRoleArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("level", targetDepth)) {
+                    context.nextToken();
+                    loggingOptions.setLevel(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("enabled", targetDepth)) {
+                    context.nextToken();
+                    loggingOptions.setEnabled(context.getUnmarshaller(Boolean.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorDebugOptions", targetDepth)) {
+                    context.nextToken();
+                    loggingOptions.setDetectorDebugOptions(new ListUnmarshaller<DetectorDebugOption>(DetectorDebugOptionJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return loggingOptions;
+    }
+
+    private static LoggingOptionsJsonUnmarshaller instance;
+
+    public static LoggingOptionsJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new LoggingOptionsJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/LoggingOptionsMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/LoggingOptionsMarshaller.java
new file mode 100644
index 000000000000..8428aede53d3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/LoggingOptionsMarshaller.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * LoggingOptionsMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class LoggingOptionsMarshaller {
+
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+    private static final MarshallingInfo<String> LEVEL_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("level").build();
+    private static final MarshallingInfo<Boolean> ENABLED_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("enabled").build();
+    private static final MarshallingInfo<List> DETECTORDEBUGOPTIONS_BINDING = MarshallingInfo.builder(MarshallingType.LIST)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorDebugOptions").build();
+
+    private static final LoggingOptionsMarshaller instance = new LoggingOptionsMarshaller();
+
+    public static LoggingOptionsMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(LoggingOptions loggingOptions, ProtocolMarshaller protocolMarshaller) {
+
+        if (loggingOptions == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(loggingOptions.getRoleArn(), ROLEARN_BINDING);
+            protocolMarshaller.marshall(loggingOptions.getLevel(), LEVEL_BINDING);
+            protocolMarshaller.marshall(loggingOptions.getEnabled(), ENABLED_BINDING);
+            protocolMarshaller.marshall(loggingOptions.getDetectorDebugOptions(), DETECTORDEBUGOPTIONS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnEnterLifecycleJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnEnterLifecycleJsonUnmarshaller.java
new file mode 100644
index 000000000000..a21b6f349fc0
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnEnterLifecycleJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * OnEnterLifecycle JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class OnEnterLifecycleJsonUnmarshaller implements Unmarshaller<OnEnterLifecycle, JsonUnmarshallerContext> {
+
+    public OnEnterLifecycle unmarshall(JsonUnmarshallerContext context) throws Exception {
+        OnEnterLifecycle onEnterLifecycle = new OnEnterLifecycle();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("events", targetDepth)) {
+                    context.nextToken();
+                    onEnterLifecycle.setEvents(new ListUnmarshaller<Event>(EventJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return onEnterLifecycle;
+    }
+
+    private static OnEnterLifecycleJsonUnmarshaller instance;
+
+    public static OnEnterLifecycleJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new OnEnterLifecycleJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnEnterLifecycleMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnEnterLifecycleMarshaller.java
new file mode 100644
index 000000000000..9c4d6b63ed76
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnEnterLifecycleMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * OnEnterLifecycleMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class OnEnterLifecycleMarshaller {
+
+    private static final MarshallingInfo<List> EVENTS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("events").build();
+
+    private static final OnEnterLifecycleMarshaller instance = new OnEnterLifecycleMarshaller();
+
+    public static OnEnterLifecycleMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(OnEnterLifecycle onEnterLifecycle, ProtocolMarshaller protocolMarshaller) {
+
+        if (onEnterLifecycle == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(onEnterLifecycle.getEvents(), EVENTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnExitLifecycleJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnExitLifecycleJsonUnmarshaller.java
new file mode 100644
index 000000000000..57c9bd23249d
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnExitLifecycleJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * OnExitLifecycle JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class OnExitLifecycleJsonUnmarshaller implements Unmarshaller<OnExitLifecycle, JsonUnmarshallerContext> {
+
+    public OnExitLifecycle unmarshall(JsonUnmarshallerContext context) throws Exception {
+        OnExitLifecycle onExitLifecycle = new OnExitLifecycle();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("events", targetDepth)) {
+                    context.nextToken();
+                    onExitLifecycle.setEvents(new ListUnmarshaller<Event>(EventJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return onExitLifecycle;
+    }
+
+    private static OnExitLifecycleJsonUnmarshaller instance;
+
+    public static OnExitLifecycleJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new OnExitLifecycleJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnExitLifecycleMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnExitLifecycleMarshaller.java
new file mode 100644
index 000000000000..3331eafecd21
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnExitLifecycleMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * OnExitLifecycleMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class OnExitLifecycleMarshaller {
+
+    private static final MarshallingInfo<List> EVENTS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("events").build();
+
+    private static final OnExitLifecycleMarshaller instance = new OnExitLifecycleMarshaller();
+
+    public static OnExitLifecycleMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(OnExitLifecycle onExitLifecycle, ProtocolMarshaller protocolMarshaller) {
+
+        if (onExitLifecycle == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(onExitLifecycle.getEvents(), EVENTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnInputLifecycleJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnInputLifecycleJsonUnmarshaller.java
new file mode 100644
index 000000000000..932a8179ce7b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnInputLifecycleJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * OnInputLifecycle JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class OnInputLifecycleJsonUnmarshaller implements Unmarshaller<OnInputLifecycle, JsonUnmarshallerContext> {
+
+    public OnInputLifecycle unmarshall(JsonUnmarshallerContext context) throws Exception {
+        OnInputLifecycle onInputLifecycle = new OnInputLifecycle();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("events", targetDepth)) {
+                    context.nextToken();
+                    onInputLifecycle.setEvents(new ListUnmarshaller<Event>(EventJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("transitionEvents", targetDepth)) {
+                    context.nextToken();
+                    onInputLifecycle.setTransitionEvents(new ListUnmarshaller<TransitionEvent>(TransitionEventJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return onInputLifecycle;
+    }
+
+    private static OnInputLifecycleJsonUnmarshaller instance;
+
+    public static OnInputLifecycleJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new OnInputLifecycleJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnInputLifecycleMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnInputLifecycleMarshaller.java
new file mode 100644
index 000000000000..aa4605ee6f28
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/OnInputLifecycleMarshaller.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * OnInputLifecycleMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class OnInputLifecycleMarshaller {
+
+    private static final MarshallingInfo<List> EVENTS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("events").build();
+    private static final MarshallingInfo<List> TRANSITIONEVENTS_BINDING = MarshallingInfo.builder(MarshallingType.LIST)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("transitionEvents").build();
+
+    private static final OnInputLifecycleMarshaller instance = new OnInputLifecycleMarshaller();
+
+    public static OnInputLifecycleMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(OnInputLifecycle onInputLifecycle, ProtocolMarshaller protocolMarshaller) {
+
+        if (onInputLifecycle == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(onInputLifecycle.getEvents(), EVENTS_BINDING);
+            protocolMarshaller.marshall(onInputLifecycle.getTransitionEvents(), TRANSITIONEVENTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsRequestMarshaller.java
new file mode 100644
index 000000000000..33df6f23962d
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsRequestMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * PutLoggingOptionsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class PutLoggingOptionsRequestMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> LOGGINGOPTIONS_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("loggingOptions").build();
+
+    private static final PutLoggingOptionsRequestMarshaller instance = new PutLoggingOptionsRequestMarshaller();
+
+    public static PutLoggingOptionsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(PutLoggingOptionsRequest putLoggingOptionsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (putLoggingOptionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(putLoggingOptionsRequest.getLoggingOptions(), LOGGINGOPTIONS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..69e60fda235d
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * PutLoggingOptionsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class PutLoggingOptionsRequestProtocolMarshaller implements Marshaller<Request<PutLoggingOptionsRequest>, PutLoggingOptionsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/logging")
+            .httpMethodName(HttpMethodName.PUT).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public PutLoggingOptionsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<PutLoggingOptionsRequest> marshall(PutLoggingOptionsRequest putLoggingOptionsRequest) {
+
+        if (putLoggingOptionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<PutLoggingOptionsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    putLoggingOptionsRequest);
+
+            protocolMarshaller.startMarshalling();
+            PutLoggingOptionsRequestMarshaller.getInstance().marshall(putLoggingOptionsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..78a9415f9923
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/PutLoggingOptionsResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * PutLoggingOptionsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class PutLoggingOptionsResultJsonUnmarshaller implements Unmarshaller<PutLoggingOptionsResult, JsonUnmarshallerContext> {
+
+    public PutLoggingOptionsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        PutLoggingOptionsResult putLoggingOptionsResult = new PutLoggingOptionsResult();
+
+        return putLoggingOptionsResult;
+    }
+
+    private static PutLoggingOptionsResultJsonUnmarshaller instance;
+
+    public static PutLoggingOptionsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new PutLoggingOptionsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ResetTimerActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ResetTimerActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..a99b660e7ef2
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ResetTimerActionJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ResetTimerAction JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResetTimerActionJsonUnmarshaller implements Unmarshaller<ResetTimerAction, JsonUnmarshallerContext> {
+
+    public ResetTimerAction unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ResetTimerAction resetTimerAction = new ResetTimerAction();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("timerName", targetDepth)) {
+                    context.nextToken();
+                    resetTimerAction.setTimerName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return resetTimerAction;
+    }
+
+    private static ResetTimerActionJsonUnmarshaller instance;
+
+    public static ResetTimerActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ResetTimerActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ResetTimerActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ResetTimerActionMarshaller.java
new file mode 100644
index 000000000000..d4445fc6f19b
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/ResetTimerActionMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ResetTimerActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ResetTimerActionMarshaller {
+
+    private static final MarshallingInfo<String> TIMERNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("timerName").build();
+
+    private static final ResetTimerActionMarshaller instance = new ResetTimerActionMarshaller();
+
+    public static ResetTimerActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ResetTimerAction resetTimerAction, ProtocolMarshaller protocolMarshaller) {
+
+        if (resetTimerAction == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(resetTimerAction.getTimerName(), TIMERNAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SNSTopicPublishActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SNSTopicPublishActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..6f8358518ce3
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SNSTopicPublishActionJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * SNSTopicPublishAction JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SNSTopicPublishActionJsonUnmarshaller implements Unmarshaller<SNSTopicPublishAction, JsonUnmarshallerContext> {
+
+    public SNSTopicPublishAction unmarshall(JsonUnmarshallerContext context) throws Exception {
+        SNSTopicPublishAction sNSTopicPublishAction = new SNSTopicPublishAction();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("targetArn", targetDepth)) {
+                    context.nextToken();
+                    sNSTopicPublishAction.setTargetArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return sNSTopicPublishAction;
+    }
+
+    private static SNSTopicPublishActionJsonUnmarshaller instance;
+
+    public static SNSTopicPublishActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new SNSTopicPublishActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SNSTopicPublishActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SNSTopicPublishActionMarshaller.java
new file mode 100644
index 000000000000..3376038d6efd
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SNSTopicPublishActionMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * SNSTopicPublishActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class SNSTopicPublishActionMarshaller {
+
+    private static final MarshallingInfo<String> TARGETARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("targetArn").build();
+
+    private static final SNSTopicPublishActionMarshaller instance = new SNSTopicPublishActionMarshaller();
+
+    public static SNSTopicPublishActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(SNSTopicPublishAction sNSTopicPublishAction, ProtocolMarshaller protocolMarshaller) {
+
+        if (sNSTopicPublishAction == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(sNSTopicPublishAction.getTargetArn(), TARGETARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetTimerActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetTimerActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..d76fd2272c1a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetTimerActionJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * SetTimerAction JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SetTimerActionJsonUnmarshaller implements Unmarshaller<SetTimerAction, JsonUnmarshallerContext> {
+
+    public SetTimerAction unmarshall(JsonUnmarshallerContext context) throws Exception {
+        SetTimerAction setTimerAction = new SetTimerAction();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("timerName", targetDepth)) {
+                    context.nextToken();
+                    setTimerAction.setTimerName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("seconds", targetDepth)) {
+                    context.nextToken();
+                    setTimerAction.setSeconds(context.getUnmarshaller(Integer.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return setTimerAction;
+    }
+
+    private static SetTimerActionJsonUnmarshaller instance;
+
+    public static SetTimerActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new SetTimerActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetTimerActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetTimerActionMarshaller.java
new file mode 100644
index 000000000000..d70575670142
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetTimerActionMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * SetTimerActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class SetTimerActionMarshaller {
+
+    private static final MarshallingInfo<String> TIMERNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("timerName").build();
+    private static final MarshallingInfo<Integer> SECONDS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("seconds").build();
+
+    private static final SetTimerActionMarshaller instance = new SetTimerActionMarshaller();
+
+    public static SetTimerActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(SetTimerAction setTimerAction, ProtocolMarshaller protocolMarshaller) {
+
+        if (setTimerAction == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(setTimerAction.getTimerName(), TIMERNAME_BINDING);
+            protocolMarshaller.marshall(setTimerAction.getSeconds(), SECONDS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetVariableActionJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetVariableActionJsonUnmarshaller.java
new file mode 100644
index 000000000000..1c956ee1c75e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetVariableActionJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * SetVariableAction JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SetVariableActionJsonUnmarshaller implements Unmarshaller<SetVariableAction, JsonUnmarshallerContext> {
+
+    public SetVariableAction unmarshall(JsonUnmarshallerContext context) throws Exception {
+        SetVariableAction setVariableAction = new SetVariableAction();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("variableName", targetDepth)) {
+                    context.nextToken();
+                    setVariableAction.setVariableName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("value", targetDepth)) {
+                    context.nextToken();
+                    setVariableAction.setValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return setVariableAction;
+    }
+
+    private static SetVariableActionJsonUnmarshaller instance;
+
+    public static SetVariableActionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new SetVariableActionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetVariableActionMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetVariableActionMarshaller.java
new file mode 100644
index 000000000000..4b6449938b83
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/SetVariableActionMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * SetVariableActionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class SetVariableActionMarshaller {
+
+    private static final MarshallingInfo<String> VARIABLENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("variableName").build();
+    private static final MarshallingInfo<String> VALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("value").build();
+
+    private static final SetVariableActionMarshaller instance = new SetVariableActionMarshaller();
+
+    public static SetVariableActionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(SetVariableAction setVariableAction, ProtocolMarshaller protocolMarshaller) {
+
+        if (setVariableAction == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(setVariableAction.getVariableName(), VARIABLENAME_BINDING);
+            protocolMarshaller.marshall(setVariableAction.getValue(), VALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/StateJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/StateJsonUnmarshaller.java
new file mode 100644
index 000000000000..2c3d8e173a27
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/StateJsonUnmarshaller.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * State JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StateJsonUnmarshaller implements Unmarshaller<State, JsonUnmarshallerContext> {
+
+    public State unmarshall(JsonUnmarshallerContext context) throws Exception {
+        State state = new State();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("stateName", targetDepth)) {
+                    context.nextToken();
+                    state.setStateName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("onInput", targetDepth)) {
+                    context.nextToken();
+                    state.setOnInput(OnInputLifecycleJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("onEnter", targetDepth)) {
+                    context.nextToken();
+                    state.setOnEnter(OnEnterLifecycleJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("onExit", targetDepth)) {
+                    context.nextToken();
+                    state.setOnExit(OnExitLifecycleJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return state;
+    }
+
+    private static StateJsonUnmarshaller instance;
+
+    public static StateJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new StateJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/StateMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/StateMarshaller.java
new file mode 100644
index 000000000000..7941a55e0c38
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/StateMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * StateMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class StateMarshaller {
+
+    private static final MarshallingInfo<String> STATENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("stateName").build();
+    private static final MarshallingInfo<StructuredPojo> ONINPUT_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("onInput").build();
+    private static final MarshallingInfo<StructuredPojo> ONENTER_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("onEnter").build();
+    private static final MarshallingInfo<StructuredPojo> ONEXIT_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("onExit").build();
+
+    private static final StateMarshaller instance = new StateMarshaller();
+
+    public static StateMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(State state, ProtocolMarshaller protocolMarshaller) {
+
+        if (state == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(state.getStateName(), STATENAME_BINDING);
+            protocolMarshaller.marshall(state.getOnInput(), ONINPUT_BINDING);
+            protocolMarshaller.marshall(state.getOnEnter(), ONENTER_BINDING);
+            protocolMarshaller.marshall(state.getOnExit(), ONEXIT_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagJsonUnmarshaller.java
new file mode 100644
index 000000000000..c11284dde5d7
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Tag JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagJsonUnmarshaller implements Unmarshaller<Tag, JsonUnmarshallerContext> {
+
+    public Tag unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Tag tag = new Tag();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("key", targetDepth)) {
+                    context.nextToken();
+                    tag.setKey(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("value", targetDepth)) {
+                    context.nextToken();
+                    tag.setValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return tag;
+    }
+
+    private static TagJsonUnmarshaller instance;
+
+    public static TagJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TagJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagMarshaller.java
new file mode 100644
index 000000000000..156e69168a90
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TagMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TagMarshaller {
+
+    private static final MarshallingInfo<String> KEY_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("key").build();
+    private static final MarshallingInfo<String> VALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("value").build();
+
+    private static final TagMarshaller instance = new TagMarshaller();
+
+    public static TagMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Tag tag, ProtocolMarshaller protocolMarshaller) {
+
+        if (tag == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(tag.getKey(), KEY_BINDING);
+            protocolMarshaller.marshall(tag.getValue(), VALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceRequestMarshaller.java
new file mode 100644
index 000000000000..d929cbe67268
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceRequestMarshaller.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TagResourceRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TagResourceRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<List> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
+
+    private static final TagResourceRequestMarshaller instance = new TagResourceRequestMarshaller();
+
+    public static TagResourceRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(TagResourceRequest tagResourceRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (tagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(tagResourceRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(tagResourceRequest.getTags(), TAGS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..660520a6268a
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TagResourceRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TagResourceRequestProtocolMarshaller implements Marshaller<Request<TagResourceRequest>, TagResourceRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/tags")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public TagResourceRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<TagResourceRequest> marshall(TagResourceRequest tagResourceRequest) {
+
+        if (tagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<TagResourceRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    tagResourceRequest);
+
+            protocolMarshaller.startMarshalling();
+            TagResourceRequestMarshaller.getInstance().marshall(tagResourceRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..9924d86ee8fe
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TagResourceResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * TagResourceResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TagResourceResultJsonUnmarshaller implements Unmarshaller<TagResourceResult, JsonUnmarshallerContext> {
+
+    public TagResourceResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        TagResourceResult tagResourceResult = new TagResourceResult();
+
+        return tagResourceResult;
+    }
+
+    private static TagResourceResultJsonUnmarshaller instance;
+
+    public static TagResourceResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TagResourceResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TransitionEventJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TransitionEventJsonUnmarshaller.java
new file mode 100644
index 000000000000..d8736b616a51
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TransitionEventJsonUnmarshaller.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * TransitionEvent JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TransitionEventJsonUnmarshaller implements Unmarshaller<TransitionEvent, JsonUnmarshallerContext> {
+
+    public TransitionEvent unmarshall(JsonUnmarshallerContext context) throws Exception {
+        TransitionEvent transitionEvent = new TransitionEvent();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("eventName", targetDepth)) {
+                    context.nextToken();
+                    transitionEvent.setEventName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("condition", targetDepth)) {
+                    context.nextToken();
+                    transitionEvent.setCondition(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("actions", targetDepth)) {
+                    context.nextToken();
+                    transitionEvent.setActions(new ListUnmarshaller<Action>(ActionJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("nextState", targetDepth)) {
+                    context.nextToken();
+                    transitionEvent.setNextState(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return transitionEvent;
+    }
+
+    private static TransitionEventJsonUnmarshaller instance;
+
+    public static TransitionEventJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TransitionEventJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TransitionEventMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TransitionEventMarshaller.java
new file mode 100644
index 000000000000..f0d36a8631b9
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/TransitionEventMarshaller.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TransitionEventMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TransitionEventMarshaller {
+
+    private static final MarshallingInfo<String> EVENTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("eventName").build();
+    private static final MarshallingInfo<String> CONDITION_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("condition").build();
+    private static final MarshallingInfo<List> ACTIONS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("actions").build();
+    private static final MarshallingInfo<String> NEXTSTATE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("nextState").build();
+
+    private static final TransitionEventMarshaller instance = new TransitionEventMarshaller();
+
+    public static TransitionEventMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(TransitionEvent transitionEvent, ProtocolMarshaller protocolMarshaller) {
+
+        if (transitionEvent == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(transitionEvent.getEventName(), EVENTNAME_BINDING);
+            protocolMarshaller.marshall(transitionEvent.getCondition(), CONDITION_BINDING);
+            protocolMarshaller.marshall(transitionEvent.getActions(), ACTIONS_BINDING);
+            protocolMarshaller.marshall(transitionEvent.getNextState(), NEXTSTATE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceRequestMarshaller.java
new file mode 100644
index 000000000000..2c8991bc9fe8
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceRequestMarshaller.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UntagResourceRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UntagResourceRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<List> TAGKEYS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.QUERY_PARAM)
+            .marshallLocationName("tagKeys").build();
+
+    private static final UntagResourceRequestMarshaller instance = new UntagResourceRequestMarshaller();
+
+    public static UntagResourceRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UntagResourceRequest untagResourceRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (untagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(untagResourceRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(untagResourceRequest.getTagKeys(), TAGKEYS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..0d1e554a859e
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UntagResourceRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UntagResourceRequestProtocolMarshaller implements Marshaller<Request<UntagResourceRequest>, UntagResourceRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/tags")
+            .httpMethodName(HttpMethodName.DELETE).hasExplicitPayloadMember(false).hasPayloadMembers(false).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public UntagResourceRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<UntagResourceRequest> marshall(UntagResourceRequest untagResourceRequest) {
+
+        if (untagResourceRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<UntagResourceRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    untagResourceRequest);
+
+            protocolMarshaller.startMarshalling();
+            UntagResourceRequestMarshaller.getInstance().marshall(untagResourceRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..c30cf1a2f2b2
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UntagResourceResultJsonUnmarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UntagResourceResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UntagResourceResultJsonUnmarshaller implements Unmarshaller<UntagResourceResult, JsonUnmarshallerContext> {
+
+    public UntagResourceResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UntagResourceResult untagResourceResult = new UntagResourceResult();
+
+        return untagResourceResult;
+    }
+
+    private static UntagResourceResultJsonUnmarshaller instance;
+
+    public static UntagResourceResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UntagResourceResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelRequestMarshaller.java
new file mode 100644
index 000000000000..fd5019dbe29c
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelRequestMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateDetectorModelRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateDetectorModelRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<StructuredPojo> DETECTORMODELDEFINITION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDefinition").build();
+    private static final MarshallingInfo<String> DETECTORMODELDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelDescription").build();
+    private static final MarshallingInfo<String> ROLEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("roleArn").build();
+
+    private static final UpdateDetectorModelRequestMarshaller instance = new UpdateDetectorModelRequestMarshaller();
+
+    public static UpdateDetectorModelRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UpdateDetectorModelRequest updateDetectorModelRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (updateDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(updateDetectorModelRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(updateDetectorModelRequest.getDetectorModelDefinition(), DETECTORMODELDEFINITION_BINDING);
+            protocolMarshaller.marshall(updateDetectorModelRequest.getDetectorModelDescription(), DETECTORMODELDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(updateDetectorModelRequest.getRoleArn(), ROLEARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..085881629b70
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateDetectorModelRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateDetectorModelRequestProtocolMarshaller implements Marshaller<Request<UpdateDetectorModelRequest>, UpdateDetectorModelRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/detector-models/{detectorModelName}").httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true)
+            .serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public UpdateDetectorModelRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<UpdateDetectorModelRequest> marshall(UpdateDetectorModelRequest updateDetectorModelRequest) {
+
+        if (updateDetectorModelRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<UpdateDetectorModelRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    updateDetectorModelRequest);
+
+            protocolMarshaller.startMarshalling();
+            UpdateDetectorModelRequestMarshaller.getInstance().marshall(updateDetectorModelRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..b3309f80e099
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateDetectorModelResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UpdateDetectorModelResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateDetectorModelResultJsonUnmarshaller implements Unmarshaller<UpdateDetectorModelResult, JsonUnmarshallerContext> {
+
+    public UpdateDetectorModelResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UpdateDetectorModelResult updateDetectorModelResult = new UpdateDetectorModelResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return updateDetectorModelResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelConfiguration", targetDepth)) {
+                    context.nextToken();
+                    updateDetectorModelResult.setDetectorModelConfiguration(DetectorModelConfigurationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return updateDetectorModelResult;
+    }
+
+    private static UpdateDetectorModelResultJsonUnmarshaller instance;
+
+    public static UpdateDetectorModelResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UpdateDetectorModelResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputRequestMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputRequestMarshaller.java
new file mode 100644
index 000000000000..46d2704b96b9
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.iotevents.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateInputRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateInputRequestMarshaller {
+
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("inputName").build();
+    private static final MarshallingInfo<String> INPUTDESCRIPTION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDescription").build();
+    private static final MarshallingInfo<StructuredPojo> INPUTDEFINITION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inputDefinition").build();
+
+    private static final UpdateInputRequestMarshaller instance = new UpdateInputRequestMarshaller();
+
+    public static UpdateInputRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UpdateInputRequest updateInputRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (updateInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(updateInputRequest.getInputName(), INPUTNAME_BINDING);
+            protocolMarshaller.marshall(updateInputRequest.getInputDescription(), INPUTDESCRIPTION_BINDING);
+            protocolMarshaller.marshall(updateInputRequest.getInputDefinition(), INPUTDEFINITION_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputRequestProtocolMarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..56fa120a242d
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateInputRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateInputRequestProtocolMarshaller implements Marshaller<Request<UpdateInputRequest>, UpdateInputRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/inputs/{inputName}")
+            .httpMethodName(HttpMethodName.PUT).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEvents").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public UpdateInputRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<UpdateInputRequest> marshall(UpdateInputRequest updateInputRequest) {
+
+        if (updateInputRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<UpdateInputRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    updateInputRequest);
+
+            protocolMarshaller.startMarshalling();
+            UpdateInputRequestMarshaller.getInstance().marshall(updateInputRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputResultJsonUnmarshaller.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..e06676ca2807
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/model/transform/UpdateInputResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.iotevents.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.iotevents.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UpdateInputResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateInputResultJsonUnmarshaller implements Unmarshaller<UpdateInputResult, JsonUnmarshallerContext> {
+
+    public UpdateInputResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UpdateInputResult updateInputResult = new UpdateInputResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return updateInputResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("inputConfiguration", targetDepth)) {
+                    context.nextToken();
+                    updateInputResult.setInputConfiguration(InputConfigurationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return updateInputResult;
+    }
+
+    private static UpdateInputResultJsonUnmarshaller instance;
+
+    public static UpdateInputResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UpdateInputResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/package-info.java b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/package-info.java
new file mode 100644
index 000000000000..a2bb90ad2414
--- /dev/null
+++ b/aws-java-sdk-iotevents/src/main/java/com/amazonaws/services/iotevents/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014-2019 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.
+ */
+
+/**
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+package com.amazonaws.services.iotevents;
+
diff --git a/aws-java-sdk-ioteventsdata/build.properties b/aws-java-sdk-ioteventsdata/build.properties
new file mode 100644
index 000000000000..0ceaa2b36ba5
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/build.properties
@@ -0,0 +1,10 @@
+source.. = src/main/java,\
+           src/main/resources
+output.. = bin/
+
+bin.includes = LICENSE.txt,\
+               NOTICE.txt,\
+               META-INF/,\
+               .
+
+jre.compilation.profile = JavaSE-1.6
\ No newline at end of file
diff --git a/aws-java-sdk-ioteventsdata/pom.xml b/aws-java-sdk-ioteventsdata/pom.xml
new file mode 100644
index 000000000000..cad3b00b6323
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.amazonaws</groupId>
+    <artifactId>aws-java-sdk-pom</artifactId>
+    <version>1.11.563</version>
+  </parent>
+  <groupId>com.amazonaws</groupId>
+  <artifactId>aws-java-sdk-ioteventsdata</artifactId>
+  <name>AWS Java SDK for AWS IoT Events Data</name>
+  <description>The AWS Java SDK for AWS IoT Events Data module holds the client classes that are used for communicating with AWS IoT Events Data Service</description>
+  <url>https://aws.amazon.com/sdkforjava</url>
+
+  <!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
+  <dependencies>
+    <dependency>
+        <artifactId>aws-java-sdk-core</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>aws-java-sdk-test-utils</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <scope>test</scope>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>jmespath-java</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+    </dependency>
+</dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- This profile uses the JAPICMP plugin to generate a report of changes between the release version and the latest version -->
+  <!-- For more information on the plugin, see https://github.com/siom79/japicmp -->
+  <profiles>
+    <profile>
+      <id>versiondiff</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.siom79.japicmp</groupId>
+            <artifactId>japicmp-maven-plugin</artifactId>
+            <version>0.5.0</version>
+            <executions>
+              <execution>
+                <phase>verify</phase>
+                <goals>
+                  <goal>cmp</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <oldVersion>
+                <dependency>
+                  <groupId>com.amazonaws</groupId>
+                  <artifactId>aws-java-sdk-ioteventsdata</artifactId>
+                  <version>RELEASE</version>
+                </dependency>
+              </oldVersion>
+              <newVersion>
+                <file>
+                  <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+                </file>
+              </newVersion>
+              <parameter>
+                <onlyModified>true</onlyModified>
+                <accessModifier>public</accessModifier>
+                <breakBuildOnModifications>false</breakBuildOnModifications>
+                <breakBuildOnBinaryIncompatibleModifications>false</breakBuildOnBinaryIncompatibleModifications>
+                <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+              </parameter>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsData.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsData.java
new file mode 100644
index 000000000000..0a5bc65e69bc
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsData.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.*;
+import com.amazonaws.regions.*;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+
+/**
+ * Interface for accessing AWS IoT Events Data.
+ * <p>
+ * <b>Note:</b> Do not directly implement this interface, new methods are added to it regularly. Extend from
+ * {@link com.amazonaws.services.ioteventsdata.AbstractAWSIoTEventsData} instead.
+ * </p>
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public interface AWSIoTEventsData {
+
+    /**
+     * The region metadata service name for computing region endpoints. You can use this value to retrieve metadata
+     * (such as supported regions) of the service.
+     *
+     * @see RegionUtils#getRegionsForService(String)
+     */
+    String ENDPOINT_PREFIX = "data.iotevents";
+
+    /**
+     * <p>
+     * Sends a set of messages to the AWS IoT Events system. Each message payload will be transformed into the input you
+     * specify (<code>inputName</code>) and ingested into any detectors that monitor that input. If multiple messages
+     * are sent, the order in which the messages are processed is not guaranteed--you must send messages one at a time
+     * and wait for a successful response to guarantee ordering.
+     * </p>
+     * 
+     * @param batchPutMessageRequest
+     * @return Result of the BatchPutMessage operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @sample AWSIoTEventsData.BatchPutMessage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessage" target="_top">AWS
+     *      API Documentation</a>
+     */
+    BatchPutMessageResult batchPutMessage(BatchPutMessageRequest batchPutMessageRequest);
+
+    /**
+     * <p>
+     * Updates the state, variable values, and timer settings of one or more detectors (instances) of a specified
+     * detector model.
+     * </p>
+     * 
+     * @param batchUpdateDetectorRequest
+     * @return Result of the BatchUpdateDetector operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @sample AWSIoTEventsData.BatchUpdateDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    BatchUpdateDetectorResult batchUpdateDetector(BatchUpdateDetectorRequest batchUpdateDetectorRequest);
+
+    /**
+     * <p>
+     * Returns information about the specified detector (instance).
+     * </p>
+     * 
+     * @param describeDetectorRequest
+     * @return Result of the DescribeDetector operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEventsData.DescribeDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DescribeDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    DescribeDetectorResult describeDetector(DescribeDetectorRequest describeDetectorRequest);
+
+    /**
+     * <p>
+     * Lists detectors (the instances of a detector model).
+     * </p>
+     * 
+     * @param listDetectorsRequest
+     * @return Result of the ListDetectors operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEventsData.ListDetectors
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/ListDetectors" target="_top">AWS
+     *      API Documentation</a>
+     */
+    ListDetectorsResult listDetectors(ListDetectorsRequest listDetectorsRequest);
+
+    /**
+     * Shuts down this client object, releasing any resources that might be held open. This is an optional method, and
+     * callers are not expected to call it, but can if they want to explicitly release any open resources. Once a client
+     * has been shutdown, it should not be used to make any more requests.
+     */
+    void shutdown();
+
+    /**
+     * Returns additional metadata for a previously executed successful request, typically used for debugging issues
+     * where a service isn't acting as expected. This data isn't considered part of the result data returned by an
+     * operation, so it's available through this separate, diagnostic interface.
+     * <p>
+     * Response metadata is only cached for a limited period of time, so if you need to access this extra diagnostic
+     * information for an executed request, you should use this method to retrieve it as soon as possible after
+     * executing a request.
+     *
+     * @param request
+     *        The originally executed request.
+     *
+     * @return The response metadata for the specified request, or null if none is available.
+     */
+    ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request);
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsync.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsync.java
new file mode 100644
index 000000000000..0520176986d6
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsync.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+
+/**
+ * Interface for accessing AWS IoT Events Data asynchronously. Each asynchronous method will return a Java Future object
+ * representing the asynchronous operation; overloads which accept an {@code AsyncHandler} can be used to receive
+ * notification when an asynchronous operation completes.
+ * <p>
+ * <b>Note:</b> Do not directly implement this interface, new methods are added to it regularly. Extend from
+ * {@link com.amazonaws.services.ioteventsdata.AbstractAWSIoTEventsDataAsync} instead.
+ * </p>
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public interface AWSIoTEventsDataAsync extends AWSIoTEventsData {
+
+    /**
+     * <p>
+     * Sends a set of messages to the AWS IoT Events system. Each message payload will be transformed into the input you
+     * specify (<code>inputName</code>) and ingested into any detectors that monitor that input. If multiple messages
+     * are sent, the order in which the messages are processed is not guaranteed--you must send messages one at a time
+     * and wait for a successful response to guarantee ordering.
+     * </p>
+     * 
+     * @param batchPutMessageRequest
+     * @return A Java Future containing the result of the BatchPutMessage operation returned by the service.
+     * @sample AWSIoTEventsDataAsync.BatchPutMessage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessage" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<BatchPutMessageResult> batchPutMessageAsync(BatchPutMessageRequest batchPutMessageRequest);
+
+    /**
+     * <p>
+     * Sends a set of messages to the AWS IoT Events system. Each message payload will be transformed into the input you
+     * specify (<code>inputName</code>) and ingested into any detectors that monitor that input. If multiple messages
+     * are sent, the order in which the messages are processed is not guaranteed--you must send messages one at a time
+     * and wait for a successful response to guarantee ordering.
+     * </p>
+     * 
+     * @param batchPutMessageRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the BatchPutMessage operation returned by the service.
+     * @sample AWSIoTEventsDataAsyncHandler.BatchPutMessage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessage" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<BatchPutMessageResult> batchPutMessageAsync(BatchPutMessageRequest batchPutMessageRequest,
+            com.amazonaws.handlers.AsyncHandler<BatchPutMessageRequest, BatchPutMessageResult> asyncHandler);
+
+    /**
+     * <p>
+     * Updates the state, variable values, and timer settings of one or more detectors (instances) of a specified
+     * detector model.
+     * </p>
+     * 
+     * @param batchUpdateDetectorRequest
+     * @return A Java Future containing the result of the BatchUpdateDetector operation returned by the service.
+     * @sample AWSIoTEventsDataAsync.BatchUpdateDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<BatchUpdateDetectorResult> batchUpdateDetectorAsync(BatchUpdateDetectorRequest batchUpdateDetectorRequest);
+
+    /**
+     * <p>
+     * Updates the state, variable values, and timer settings of one or more detectors (instances) of a specified
+     * detector model.
+     * </p>
+     * 
+     * @param batchUpdateDetectorRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the BatchUpdateDetector operation returned by the service.
+     * @sample AWSIoTEventsDataAsyncHandler.BatchUpdateDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<BatchUpdateDetectorResult> batchUpdateDetectorAsync(BatchUpdateDetectorRequest batchUpdateDetectorRequest,
+            com.amazonaws.handlers.AsyncHandler<BatchUpdateDetectorRequest, BatchUpdateDetectorResult> asyncHandler);
+
+    /**
+     * <p>
+     * Returns information about the specified detector (instance).
+     * </p>
+     * 
+     * @param describeDetectorRequest
+     * @return A Java Future containing the result of the DescribeDetector operation returned by the service.
+     * @sample AWSIoTEventsDataAsync.DescribeDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DescribeDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeDetectorResult> describeDetectorAsync(DescribeDetectorRequest describeDetectorRequest);
+
+    /**
+     * <p>
+     * Returns information about the specified detector (instance).
+     * </p>
+     * 
+     * @param describeDetectorRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DescribeDetector operation returned by the service.
+     * @sample AWSIoTEventsDataAsyncHandler.DescribeDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DescribeDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeDetectorResult> describeDetectorAsync(DescribeDetectorRequest describeDetectorRequest,
+            com.amazonaws.handlers.AsyncHandler<DescribeDetectorRequest, DescribeDetectorResult> asyncHandler);
+
+    /**
+     * <p>
+     * Lists detectors (the instances of a detector model).
+     * </p>
+     * 
+     * @param listDetectorsRequest
+     * @return A Java Future containing the result of the ListDetectors operation returned by the service.
+     * @sample AWSIoTEventsDataAsync.ListDetectors
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/ListDetectors" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListDetectorsResult> listDetectorsAsync(ListDetectorsRequest listDetectorsRequest);
+
+    /**
+     * <p>
+     * Lists detectors (the instances of a detector model).
+     * </p>
+     * 
+     * @param listDetectorsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListDetectors operation returned by the service.
+     * @sample AWSIoTEventsDataAsyncHandler.ListDetectors
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/ListDetectors" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListDetectorsResult> listDetectorsAsync(ListDetectorsRequest listDetectorsRequest,
+            com.amazonaws.handlers.AsyncHandler<ListDetectorsRequest, ListDetectorsResult> asyncHandler);
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsyncClient.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsyncClient.java
new file mode 100644
index 000000000000..6bcd37b1ebf5
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsyncClient.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.client.AwsAsyncClientParams;
+import com.amazonaws.annotation.ThreadSafe;
+
+import java.util.concurrent.ExecutorService;
+
+/**
+ * Client for accessing AWS IoT Events Data asynchronously. Each asynchronous method will return a Java Future object
+ * representing the asynchronous operation; overloads which accept an {@code AsyncHandler} can be used to receive
+ * notification when an asynchronous operation completes.
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@ThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AWSIoTEventsDataAsyncClient extends AWSIoTEventsDataClient implements AWSIoTEventsDataAsync {
+
+    private static final int DEFAULT_THREAD_POOL_SIZE = 50;
+
+    private final java.util.concurrent.ExecutorService executorService;
+
+    public static AWSIoTEventsDataAsyncClientBuilder asyncBuilder() {
+        return AWSIoTEventsDataAsyncClientBuilder.standard();
+    }
+
+    /**
+     * Constructs a new asynchronous client to invoke service methods on AWS IoT Events Data using the specified
+     * parameters.
+     *
+     * @param asyncClientParams
+     *        Object providing client parameters.
+     */
+    AWSIoTEventsDataAsyncClient(AwsAsyncClientParams asyncClientParams) {
+        super(asyncClientParams);
+        this.executorService = asyncClientParams.getExecutor();
+    }
+
+    /**
+     * Returns the executor service used by this client to execute async requests.
+     *
+     * @return The executor service used by this client to execute async requests.
+     */
+    public ExecutorService getExecutorService() {
+        return executorService;
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchPutMessageResult> batchPutMessageAsync(BatchPutMessageRequest request) {
+
+        return batchPutMessageAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchPutMessageResult> batchPutMessageAsync(final BatchPutMessageRequest request,
+            final com.amazonaws.handlers.AsyncHandler<BatchPutMessageRequest, BatchPutMessageResult> asyncHandler) {
+        final BatchPutMessageRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<BatchPutMessageResult>() {
+            @Override
+            public BatchPutMessageResult call() throws Exception {
+                BatchPutMessageResult result = null;
+
+                try {
+                    result = executeBatchPutMessage(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchUpdateDetectorResult> batchUpdateDetectorAsync(BatchUpdateDetectorRequest request) {
+
+        return batchUpdateDetectorAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchUpdateDetectorResult> batchUpdateDetectorAsync(final BatchUpdateDetectorRequest request,
+            final com.amazonaws.handlers.AsyncHandler<BatchUpdateDetectorRequest, BatchUpdateDetectorResult> asyncHandler) {
+        final BatchUpdateDetectorRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<BatchUpdateDetectorResult>() {
+            @Override
+            public BatchUpdateDetectorResult call() throws Exception {
+                BatchUpdateDetectorResult result = null;
+
+                try {
+                    result = executeBatchUpdateDetector(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorResult> describeDetectorAsync(DescribeDetectorRequest request) {
+
+        return describeDetectorAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorResult> describeDetectorAsync(final DescribeDetectorRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DescribeDetectorRequest, DescribeDetectorResult> asyncHandler) {
+        final DescribeDetectorRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DescribeDetectorResult>() {
+            @Override
+            public DescribeDetectorResult call() throws Exception {
+                DescribeDetectorResult result = null;
+
+                try {
+                    result = executeDescribeDetector(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorsResult> listDetectorsAsync(ListDetectorsRequest request) {
+
+        return listDetectorsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorsResult> listDetectorsAsync(final ListDetectorsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListDetectorsRequest, ListDetectorsResult> asyncHandler) {
+        final ListDetectorsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListDetectorsResult>() {
+            @Override
+            public ListDetectorsResult call() throws Exception {
+                ListDetectorsResult result = null;
+
+                try {
+                    result = executeListDetectors(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    /**
+     * Shuts down the client, releasing all managed resources. This includes forcibly terminating all pending
+     * asynchronous service calls. Clients who wish to give pending asynchronous service calls time to complete should
+     * call {@code getExecutorService().shutdown()} followed by {@code getExecutorService().awaitTermination()} prior to
+     * calling this method.
+     */
+    @Override
+    public void shutdown() {
+        super.shutdown();
+        executorService.shutdownNow();
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsyncClientBuilder.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsyncClientBuilder.java
new file mode 100644
index 000000000000..739087d76a02
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataAsyncClientBuilder.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.ClientConfigurationFactory;
+import com.amazonaws.annotation.NotThreadSafe;
+import com.amazonaws.client.builder.AwsAsyncClientBuilder;
+import com.amazonaws.client.AwsAsyncClientParams;
+
+/**
+ * Fluent builder for {@link com.amazonaws.services.ioteventsdata.AWSIoTEventsDataAsync}. Use of the builder is
+ * preferred over using constructors of the client class.
+ **/
+@NotThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public final class AWSIoTEventsDataAsyncClientBuilder extends AwsAsyncClientBuilder<AWSIoTEventsDataAsyncClientBuilder, AWSIoTEventsDataAsync> {
+
+    private static final ClientConfigurationFactory CLIENT_CONFIG_FACTORY = new ClientConfigurationFactory();;
+
+    /**
+     * @return Create new instance of builder with all defaults set.
+     */
+    public static AWSIoTEventsDataAsyncClientBuilder standard() {
+        return new AWSIoTEventsDataAsyncClientBuilder();
+    }
+
+    /**
+     * @return Default async client using the {@link com.amazonaws.auth.DefaultAWSCredentialsProviderChain} and
+     *         {@link com.amazonaws.regions.DefaultAwsRegionProviderChain} chain
+     */
+    public static AWSIoTEventsDataAsync defaultClient() {
+        return standard().build();
+    }
+
+    private AWSIoTEventsDataAsyncClientBuilder() {
+        super(CLIENT_CONFIG_FACTORY);
+    }
+
+    /**
+     * Construct an asynchronous implementation of AWSIoTEventsDataAsync using the current builder configuration.
+     *
+     * @param params
+     *        Current builder configuration represented as a parameter object.
+     * @return Fully configured implementation of AWSIoTEventsDataAsync.
+     */
+    @Override
+    protected AWSIoTEventsDataAsync build(AwsAsyncClientParams params) {
+        return new AWSIoTEventsDataAsyncClient(params);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataClient.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataClient.java
new file mode 100644
index 000000000000..8343a2497ccb
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataClient.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import org.w3c.dom.*;
+
+import java.net.*;
+import java.util.*;
+
+import javax.annotation.Generated;
+
+import org.apache.commons.logging.*;
+
+import com.amazonaws.*;
+import com.amazonaws.annotation.SdkInternalApi;
+import com.amazonaws.auth.*;
+
+import com.amazonaws.handlers.*;
+import com.amazonaws.http.*;
+import com.amazonaws.internal.*;
+import com.amazonaws.internal.auth.*;
+import com.amazonaws.metrics.*;
+import com.amazonaws.regions.*;
+import com.amazonaws.transform.*;
+import com.amazonaws.util.*;
+import com.amazonaws.protocol.json.*;
+import com.amazonaws.util.AWSRequestMetrics.Field;
+import com.amazonaws.annotation.ThreadSafe;
+import com.amazonaws.client.AwsSyncClientParams;
+import com.amazonaws.client.builder.AdvancedConfig;
+
+import com.amazonaws.services.ioteventsdata.AWSIoTEventsDataClientBuilder;
+
+import com.amazonaws.AmazonServiceException;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.services.ioteventsdata.model.transform.*;
+
+/**
+ * Client for accessing AWS IoT Events Data. All service calls made using this client are blocking, and will not return
+ * until the service call completes.
+ * <p>
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+@ThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AWSIoTEventsDataClient extends AmazonWebServiceClient implements AWSIoTEventsData {
+
+    /** Provider for AWS credentials. */
+    private final AWSCredentialsProvider awsCredentialsProvider;
+
+    private static final Log log = LogFactory.getLog(AWSIoTEventsData.class);
+
+    /** Default signing name for the service. */
+    private static final String DEFAULT_SIGNING_NAME = "ioteventsdata";
+
+    /** Client configuration factory providing ClientConfigurations tailored to this client */
+    protected static final ClientConfigurationFactory configFactory = new ClientConfigurationFactory();
+
+    private final AdvancedConfig advancedConfig;
+
+    private static final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory = new com.amazonaws.protocol.json.SdkJsonProtocolFactory(
+            new JsonClientMetadata()
+                    .withProtocolVersion("1.1")
+                    .withSupportsCbor(false)
+                    .withSupportsIon(false)
+                    .withContentTypeOverride("")
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ServiceUnavailableException").withModeledClass(
+                                    com.amazonaws.services.ioteventsdata.model.ServiceUnavailableException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InternalFailureException").withModeledClass(
+                                    com.amazonaws.services.ioteventsdata.model.InternalFailureException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("InvalidRequestException").withModeledClass(
+                                    com.amazonaws.services.ioteventsdata.model.InvalidRequestException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ResourceNotFoundException").withModeledClass(
+                                    com.amazonaws.services.ioteventsdata.model.ResourceNotFoundException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("ThrottlingException").withModeledClass(
+                                    com.amazonaws.services.ioteventsdata.model.ThrottlingException.class))
+                    .withBaseServiceExceptionClass(com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException.class));
+
+    public static AWSIoTEventsDataClientBuilder builder() {
+        return AWSIoTEventsDataClientBuilder.standard();
+    }
+
+    /**
+     * Constructs a new client to invoke service methods on AWS IoT Events Data using the specified parameters.
+     *
+     * <p>
+     * All service calls made using this new client object are blocking, and will not return until the service call
+     * completes.
+     *
+     * @param clientParams
+     *        Object providing client parameters.
+     */
+    AWSIoTEventsDataClient(AwsSyncClientParams clientParams) {
+        this(clientParams, false);
+    }
+
+    /**
+     * Constructs a new client to invoke service methods on AWS IoT Events Data using the specified parameters.
+     *
+     * <p>
+     * All service calls made using this new client object are blocking, and will not return until the service call
+     * completes.
+     *
+     * @param clientParams
+     *        Object providing client parameters.
+     */
+    AWSIoTEventsDataClient(AwsSyncClientParams clientParams, boolean endpointDiscoveryEnabled) {
+        super(clientParams);
+        this.awsCredentialsProvider = clientParams.getCredentialsProvider();
+        this.advancedConfig = clientParams.getAdvancedConfig();
+        init();
+    }
+
+    private void init() {
+        setServiceNameIntern(DEFAULT_SIGNING_NAME);
+        setEndpointPrefix(ENDPOINT_PREFIX);
+        // calling this.setEndPoint(...) will also modify the signer accordingly
+        setEndpoint("data.iotevents.us-east-1.amazonaws.com");
+        HandlerChainFactory chainFactory = new HandlerChainFactory();
+        requestHandler2s.addAll(chainFactory.newRequestHandlerChain("/com/amazonaws/services/ioteventsdata/request.handlers"));
+        requestHandler2s.addAll(chainFactory.newRequestHandler2Chain("/com/amazonaws/services/ioteventsdata/request.handler2s"));
+        requestHandler2s.addAll(chainFactory.getGlobalHandlers());
+    }
+
+    /**
+     * <p>
+     * Sends a set of messages to the AWS IoT Events system. Each message payload will be transformed into the input you
+     * specify (<code>inputName</code>) and ingested into any detectors that monitor that input. If multiple messages
+     * are sent, the order in which the messages are processed is not guaranteed--you must send messages one at a time
+     * and wait for a successful response to guarantee ordering.
+     * </p>
+     * 
+     * @param batchPutMessageRequest
+     * @return Result of the BatchPutMessage operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @sample AWSIoTEventsData.BatchPutMessage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessage" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public BatchPutMessageResult batchPutMessage(BatchPutMessageRequest request) {
+        request = beforeClientExecution(request);
+        return executeBatchPutMessage(request);
+    }
+
+    @SdkInternalApi
+    final BatchPutMessageResult executeBatchPutMessage(BatchPutMessageRequest batchPutMessageRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(batchPutMessageRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<BatchPutMessageRequest> request = null;
+        Response<BatchPutMessageResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new BatchPutMessageRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(batchPutMessageRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "BatchPutMessage");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<BatchPutMessageResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new BatchPutMessageResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Updates the state, variable values, and timer settings of one or more detectors (instances) of a specified
+     * detector model.
+     * </p>
+     * 
+     * @param batchUpdateDetectorRequest
+     * @return Result of the BatchUpdateDetector operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @sample AWSIoTEventsData.BatchUpdateDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public BatchUpdateDetectorResult batchUpdateDetector(BatchUpdateDetectorRequest request) {
+        request = beforeClientExecution(request);
+        return executeBatchUpdateDetector(request);
+    }
+
+    @SdkInternalApi
+    final BatchUpdateDetectorResult executeBatchUpdateDetector(BatchUpdateDetectorRequest batchUpdateDetectorRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(batchUpdateDetectorRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<BatchUpdateDetectorRequest> request = null;
+        Response<BatchUpdateDetectorResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new BatchUpdateDetectorRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(batchUpdateDetectorRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "BatchUpdateDetector");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<BatchUpdateDetectorResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new BatchUpdateDetectorResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Returns information about the specified detector (instance).
+     * </p>
+     * 
+     * @param describeDetectorRequest
+     * @return Result of the DescribeDetector operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEventsData.DescribeDetector
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DescribeDetector"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public DescribeDetectorResult describeDetector(DescribeDetectorRequest request) {
+        request = beforeClientExecution(request);
+        return executeDescribeDetector(request);
+    }
+
+    @SdkInternalApi
+    final DescribeDetectorResult executeDescribeDetector(DescribeDetectorRequest describeDetectorRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(describeDetectorRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DescribeDetectorRequest> request = null;
+        Response<DescribeDetectorResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DescribeDetectorRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(describeDetectorRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DescribeDetector");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DescribeDetectorResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new DescribeDetectorResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Lists detectors (the instances of a detector model).
+     * </p>
+     * 
+     * @param listDetectorsRequest
+     * @return Result of the ListDetectors operation returned by the service.
+     * @throws InvalidRequestException
+     *         The request was invalid.
+     * @throws ResourceNotFoundException
+     *         The resource was not found.
+     * @throws ThrottlingException
+     *         The request could not be completed due to throttling.
+     * @throws InternalFailureException
+     *         An internal failure occured.
+     * @throws ServiceUnavailableException
+     *         The service is currently unavailable.
+     * @sample AWSIoTEventsData.ListDetectors
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/ListDetectors" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public ListDetectorsResult listDetectors(ListDetectorsRequest request) {
+        request = beforeClientExecution(request);
+        return executeListDetectors(request);
+    }
+
+    @SdkInternalApi
+    final ListDetectorsResult executeListDetectors(ListDetectorsRequest listDetectorsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listDetectorsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListDetectorsRequest> request = null;
+        Response<ListDetectorsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListDetectorsRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(listDetectorsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "IoT Events Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListDetectors");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListDetectorsResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new ListDetectorsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * Returns additional metadata for a previously executed successful, request, typically used for debugging issues
+     * where a service isn't acting as expected. This data isn't considered part of the result data returned by an
+     * operation, so it's available through this separate, diagnostic interface.
+     * <p>
+     * Response metadata is only cached for a limited period of time, so if you need to access this extra diagnostic
+     * information for an executed request, you should use this method to retrieve it as soon as possible after
+     * executing the request.
+     *
+     * @param request
+     *        The originally executed request
+     *
+     * @return The response metadata for the specified request, or null if none is available.
+     */
+    public ResponseMetadata getCachedResponseMetadata(AmazonWebServiceRequest request) {
+        return client.getResponseMetadataForRequest(request);
+    }
+
+    /**
+     * Normal invoke with authentication. Credentials are required and may be overriden at the request level.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> invoke(Request<Y> request, HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler,
+            ExecutionContext executionContext) {
+
+        return invoke(request, responseHandler, executionContext, null, null);
+    }
+
+    /**
+     * Normal invoke with authentication. Credentials are required and may be overriden at the request level.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> invoke(Request<Y> request, HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler,
+            ExecutionContext executionContext, URI cachedEndpoint, URI uriFromEndpointTrait) {
+
+        executionContext.setCredentialsProvider(CredentialUtils.getCredentialsProvider(request.getOriginalRequest(), awsCredentialsProvider));
+
+        return doInvoke(request, responseHandler, executionContext, cachedEndpoint, uriFromEndpointTrait);
+    }
+
+    /**
+     * Invoke with no authentication. Credentials are not required and any credentials set on the client or request will
+     * be ignored for this operation.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> anonymousInvoke(Request<Y> request,
+            HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler, ExecutionContext executionContext) {
+
+        return doInvoke(request, responseHandler, executionContext, null, null);
+    }
+
+    /**
+     * Invoke the request using the http client. Assumes credentials (or lack thereof) have been configured in the
+     * ExecutionContext beforehand.
+     **/
+    private <X, Y extends AmazonWebServiceRequest> Response<X> doInvoke(Request<Y> request, HttpResponseHandler<AmazonWebServiceResponse<X>> responseHandler,
+            ExecutionContext executionContext, URI discoveredEndpoint, URI uriFromEndpointTrait) {
+
+        if (discoveredEndpoint != null) {
+            request.setEndpoint(discoveredEndpoint);
+            request.getOriginalRequest().getRequestClientOptions().appendUserAgent("endpoint-discovery");
+        } else if (uriFromEndpointTrait != null) {
+            request.setEndpoint(uriFromEndpointTrait);
+        } else {
+            request.setEndpoint(endpoint);
+        }
+
+        request.setTimeOffset(timeOffset);
+
+        HttpResponseHandler<AmazonServiceException> errorResponseHandler = protocolFactory.createErrorResponseHandler(new JsonErrorResponseMetadata());
+
+        return client.execute(request, responseHandler, errorResponseHandler, executionContext);
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    static com.amazonaws.protocol.json.SdkJsonProtocolFactory getProtocolFactory() {
+        return protocolFactory;
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataClientBuilder.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataClientBuilder.java
new file mode 100644
index 000000000000..36df75c7998f
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AWSIoTEventsDataClientBuilder.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.ClientConfigurationFactory;
+
+import com.amazonaws.annotation.NotThreadSafe;
+import com.amazonaws.client.builder.AwsSyncClientBuilder;
+import com.amazonaws.client.AwsSyncClientParams;
+
+/**
+ * Fluent builder for {@link com.amazonaws.services.ioteventsdata.AWSIoTEventsData}. Use of the builder is preferred
+ * over using constructors of the client class.
+ **/
+@NotThreadSafe
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public final class AWSIoTEventsDataClientBuilder extends AwsSyncClientBuilder<AWSIoTEventsDataClientBuilder, AWSIoTEventsData> {
+
+    private static final ClientConfigurationFactory CLIENT_CONFIG_FACTORY = new ClientConfigurationFactory();
+
+    /**
+     * @return Create new instance of builder with all defaults set.
+     */
+    public static AWSIoTEventsDataClientBuilder standard() {
+        return new AWSIoTEventsDataClientBuilder();
+    }
+
+    /**
+     * @return Default client using the {@link com.amazonaws.auth.DefaultAWSCredentialsProviderChain} and
+     *         {@link com.amazonaws.regions.DefaultAwsRegionProviderChain} chain
+     */
+    public static AWSIoTEventsData defaultClient() {
+        return standard().build();
+    }
+
+    private AWSIoTEventsDataClientBuilder() {
+        super(CLIENT_CONFIG_FACTORY);
+    }
+
+    /**
+     * Construct a synchronous implementation of AWSIoTEventsData using the current builder configuration.
+     *
+     * @param params
+     *        Current builder configuration represented as a parameter object.
+     * @return Fully configured implementation of AWSIoTEventsData.
+     */
+    @Override
+    protected AWSIoTEventsData build(AwsSyncClientParams params) {
+        return new AWSIoTEventsDataClient(params);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AbstractAWSIoTEventsData.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AbstractAWSIoTEventsData.java
new file mode 100644
index 000000000000..4f22bed88505
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AbstractAWSIoTEventsData.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.*;
+
+/**
+ * Abstract implementation of {@code AWSIoTEventsData}. Convenient method forms pass through to the corresponding
+ * overload that takes a request object, which throws an {@code UnsupportedOperationException}.
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AbstractAWSIoTEventsData implements AWSIoTEventsData {
+
+    protected AbstractAWSIoTEventsData() {
+    }
+
+    @Override
+    public BatchPutMessageResult batchPutMessage(BatchPutMessageRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public BatchUpdateDetectorResult batchUpdateDetector(BatchUpdateDetectorRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public DescribeDetectorResult describeDetector(DescribeDetectorRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public ListDetectorsResult listDetectors(ListDetectorsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public void shutdown() {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public com.amazonaws.ResponseMetadata getCachedResponseMetadata(com.amazonaws.AmazonWebServiceRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AbstractAWSIoTEventsDataAsync.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AbstractAWSIoTEventsDataAsync.java
new file mode 100644
index 000000000000..e40dd9fc9da2
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/AbstractAWSIoTEventsDataAsync.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+
+/**
+ * Abstract implementation of {@code AWSIoTEventsDataAsync}. Convenient method forms pass through to the corresponding
+ * overload that takes a request object and an {@code AsyncHandler}, which throws an
+ * {@code UnsupportedOperationException}.
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AbstractAWSIoTEventsDataAsync extends AbstractAWSIoTEventsData implements AWSIoTEventsDataAsync {
+
+    protected AbstractAWSIoTEventsDataAsync() {
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchPutMessageResult> batchPutMessageAsync(BatchPutMessageRequest request) {
+
+        return batchPutMessageAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchPutMessageResult> batchPutMessageAsync(BatchPutMessageRequest request,
+            com.amazonaws.handlers.AsyncHandler<BatchPutMessageRequest, BatchPutMessageResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchUpdateDetectorResult> batchUpdateDetectorAsync(BatchUpdateDetectorRequest request) {
+
+        return batchUpdateDetectorAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchUpdateDetectorResult> batchUpdateDetectorAsync(BatchUpdateDetectorRequest request,
+            com.amazonaws.handlers.AsyncHandler<BatchUpdateDetectorRequest, BatchUpdateDetectorResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorResult> describeDetectorAsync(DescribeDetectorRequest request) {
+
+        return describeDetectorAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeDetectorResult> describeDetectorAsync(DescribeDetectorRequest request,
+            com.amazonaws.handlers.AsyncHandler<DescribeDetectorRequest, DescribeDetectorResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorsResult> listDetectorsAsync(ListDetectorsRequest request) {
+
+        return listDetectorsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListDetectorsResult> listDetectorsAsync(ListDetectorsRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListDetectorsRequest, ListDetectorsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/AWSIoTEventsDataException.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/AWSIoTEventsDataException.java
new file mode 100644
index 000000000000..4aeca0a3470e
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/AWSIoTEventsDataException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * Base exception for all service exceptions thrown by AWS IoT Events Data
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class AWSIoTEventsDataException extends com.amazonaws.AmazonServiceException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new AWSIoTEventsDataException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public AWSIoTEventsDataException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageErrorEntry.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageErrorEntry.java
new file mode 100644
index 000000000000..1195ccd560d8
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageErrorEntry.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Contains informations about the errors encountered.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessageErrorEntry"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchPutMessageErrorEntry implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in
+     * the <code>message</code> object.)
+     * </p>
+     */
+    private String messageId;
+    /**
+     * <p>
+     * The code associated with the error.
+     * </p>
+     */
+    private String errorCode;
+    /**
+     * <p>
+     * More information about the error.
+     * </p>
+     */
+    private String errorMessage;
+
+    /**
+     * <p>
+     * The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in
+     * the <code>message</code> object.)
+     * </p>
+     * 
+     * @param messageId
+     *        The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code>
+     *        key in the <code>message</code> object.)
+     */
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * <p>
+     * The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in
+     * the <code>message</code> object.)
+     * </p>
+     * 
+     * @return The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code>
+     *         key in the <code>message</code> object.)
+     */
+
+    public String getMessageId() {
+        return this.messageId;
+    }
+
+    /**
+     * <p>
+     * The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in
+     * the <code>message</code> object.)
+     * </p>
+     * 
+     * @param messageId
+     *        The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code>
+     *        key in the <code>message</code> object.)
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchPutMessageErrorEntry withMessageId(String messageId) {
+        setMessageId(messageId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The code associated with the error.
+     * </p>
+     * 
+     * @param errorCode
+     *        The code associated with the error.
+     * @see ErrorCode
+     */
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    /**
+     * <p>
+     * The code associated with the error.
+     * </p>
+     * 
+     * @return The code associated with the error.
+     * @see ErrorCode
+     */
+
+    public String getErrorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * <p>
+     * The code associated with the error.
+     * </p>
+     * 
+     * @param errorCode
+     *        The code associated with the error.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ErrorCode
+     */
+
+    public BatchPutMessageErrorEntry withErrorCode(String errorCode) {
+        setErrorCode(errorCode);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The code associated with the error.
+     * </p>
+     * 
+     * @param errorCode
+     *        The code associated with the error.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ErrorCode
+     */
+
+    public BatchPutMessageErrorEntry withErrorCode(ErrorCode errorCode) {
+        this.errorCode = errorCode.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * More information about the error.
+     * </p>
+     * 
+     * @param errorMessage
+     *        More information about the error.
+     */
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    /**
+     * <p>
+     * More information about the error.
+     * </p>
+     * 
+     * @return More information about the error.
+     */
+
+    public String getErrorMessage() {
+        return this.errorMessage;
+    }
+
+    /**
+     * <p>
+     * More information about the error.
+     * </p>
+     * 
+     * @param errorMessage
+     *        More information about the error.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchPutMessageErrorEntry withErrorMessage(String errorMessage) {
+        setErrorMessage(errorMessage);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getMessageId() != null)
+            sb.append("MessageId: ").append(getMessageId()).append(",");
+        if (getErrorCode() != null)
+            sb.append("ErrorCode: ").append(getErrorCode()).append(",");
+        if (getErrorMessage() != null)
+            sb.append("ErrorMessage: ").append(getErrorMessage());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchPutMessageErrorEntry == false)
+            return false;
+        BatchPutMessageErrorEntry other = (BatchPutMessageErrorEntry) obj;
+        if (other.getMessageId() == null ^ this.getMessageId() == null)
+            return false;
+        if (other.getMessageId() != null && other.getMessageId().equals(this.getMessageId()) == false)
+            return false;
+        if (other.getErrorCode() == null ^ this.getErrorCode() == null)
+            return false;
+        if (other.getErrorCode() != null && other.getErrorCode().equals(this.getErrorCode()) == false)
+            return false;
+        if (other.getErrorMessage() == null ^ this.getErrorMessage() == null)
+            return false;
+        if (other.getErrorMessage() != null && other.getErrorMessage().equals(this.getErrorMessage()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getMessageId() == null) ? 0 : getMessageId().hashCode());
+        hashCode = prime * hashCode + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
+        hashCode = prime * hashCode + ((getErrorMessage() == null) ? 0 : getErrorMessage().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchPutMessageErrorEntry clone() {
+        try {
+            return (BatchPutMessageErrorEntry) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.BatchPutMessageErrorEntryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageRequest.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageRequest.java
new file mode 100644
index 000000000000..885fff86f4a6
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageRequest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessage" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchPutMessageRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The list of messages to send. Each message has format:
+     * <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * </p>
+     */
+    private java.util.List<Message> messages;
+
+    /**
+     * <p>
+     * The list of messages to send. Each message has format:
+     * <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * </p>
+     * 
+     * @return The list of messages to send. Each message has format:
+     *         <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     */
+
+    public java.util.List<Message> getMessages() {
+        return messages;
+    }
+
+    /**
+     * <p>
+     * The list of messages to send. Each message has format:
+     * <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * </p>
+     * 
+     * @param messages
+     *        The list of messages to send. Each message has format:
+     *        <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     */
+
+    public void setMessages(java.util.Collection<Message> messages) {
+        if (messages == null) {
+            this.messages = null;
+            return;
+        }
+
+        this.messages = new java.util.ArrayList<Message>(messages);
+    }
+
+    /**
+     * <p>
+     * The list of messages to send. Each message has format:
+     * <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setMessages(java.util.Collection)} or {@link #withMessages(java.util.Collection)} if you want to override
+     * the existing values.
+     * </p>
+     * 
+     * @param messages
+     *        The list of messages to send. Each message has format:
+     *        <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchPutMessageRequest withMessages(Message... messages) {
+        if (this.messages == null) {
+            setMessages(new java.util.ArrayList<Message>(messages.length));
+        }
+        for (Message ele : messages) {
+            this.messages.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The list of messages to send. Each message has format:
+     * <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * </p>
+     * 
+     * @param messages
+     *        The list of messages to send. Each message has format:
+     *        <code>'{ "messageId": "string", "inputName": "string", "payload": "string"}'</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchPutMessageRequest withMessages(java.util.Collection<Message> messages) {
+        setMessages(messages);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getMessages() != null)
+            sb.append("Messages: ").append(getMessages());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchPutMessageRequest == false)
+            return false;
+        BatchPutMessageRequest other = (BatchPutMessageRequest) obj;
+        if (other.getMessages() == null ^ this.getMessages() == null)
+            return false;
+        if (other.getMessages() != null && other.getMessages().equals(this.getMessages()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getMessages() == null) ? 0 : getMessages().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchPutMessageRequest clone() {
+        return (BatchPutMessageRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageResult.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageResult.java
new file mode 100644
index 000000000000..ba1563b239c6
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchPutMessageResult.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchPutMessage" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchPutMessageResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * A list of any errors encountered when sending the messages.
+     * </p>
+     */
+    private java.util.List<BatchPutMessageErrorEntry> batchPutMessageErrorEntries;
+
+    /**
+     * <p>
+     * A list of any errors encountered when sending the messages.
+     * </p>
+     * 
+     * @return A list of any errors encountered when sending the messages.
+     */
+
+    public java.util.List<BatchPutMessageErrorEntry> getBatchPutMessageErrorEntries() {
+        return batchPutMessageErrorEntries;
+    }
+
+    /**
+     * <p>
+     * A list of any errors encountered when sending the messages.
+     * </p>
+     * 
+     * @param batchPutMessageErrorEntries
+     *        A list of any errors encountered when sending the messages.
+     */
+
+    public void setBatchPutMessageErrorEntries(java.util.Collection<BatchPutMessageErrorEntry> batchPutMessageErrorEntries) {
+        if (batchPutMessageErrorEntries == null) {
+            this.batchPutMessageErrorEntries = null;
+            return;
+        }
+
+        this.batchPutMessageErrorEntries = new java.util.ArrayList<BatchPutMessageErrorEntry>(batchPutMessageErrorEntries);
+    }
+
+    /**
+     * <p>
+     * A list of any errors encountered when sending the messages.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setBatchPutMessageErrorEntries(java.util.Collection)} or
+     * {@link #withBatchPutMessageErrorEntries(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param batchPutMessageErrorEntries
+     *        A list of any errors encountered when sending the messages.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchPutMessageResult withBatchPutMessageErrorEntries(BatchPutMessageErrorEntry... batchPutMessageErrorEntries) {
+        if (this.batchPutMessageErrorEntries == null) {
+            setBatchPutMessageErrorEntries(new java.util.ArrayList<BatchPutMessageErrorEntry>(batchPutMessageErrorEntries.length));
+        }
+        for (BatchPutMessageErrorEntry ele : batchPutMessageErrorEntries) {
+            this.batchPutMessageErrorEntries.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * A list of any errors encountered when sending the messages.
+     * </p>
+     * 
+     * @param batchPutMessageErrorEntries
+     *        A list of any errors encountered when sending the messages.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchPutMessageResult withBatchPutMessageErrorEntries(java.util.Collection<BatchPutMessageErrorEntry> batchPutMessageErrorEntries) {
+        setBatchPutMessageErrorEntries(batchPutMessageErrorEntries);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBatchPutMessageErrorEntries() != null)
+            sb.append("BatchPutMessageErrorEntries: ").append(getBatchPutMessageErrorEntries());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchPutMessageResult == false)
+            return false;
+        BatchPutMessageResult other = (BatchPutMessageResult) obj;
+        if (other.getBatchPutMessageErrorEntries() == null ^ this.getBatchPutMessageErrorEntries() == null)
+            return false;
+        if (other.getBatchPutMessageErrorEntries() != null && other.getBatchPutMessageErrorEntries().equals(this.getBatchPutMessageErrorEntries()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBatchPutMessageErrorEntries() == null) ? 0 : getBatchPutMessageErrorEntries().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchPutMessageResult clone() {
+        try {
+            return (BatchPutMessageResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorErrorEntry.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorErrorEntry.java
new file mode 100644
index 000000000000..7385c8139481
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorErrorEntry.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the error which occured when attempting to update a detector.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetectorErrorEntry"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchUpdateDetectorErrorEntry implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in the
+     * update request <code>Detector</code> object.)
+     * </p>
+     */
+    private String messageId;
+    /**
+     * <p>
+     * The code of the error.
+     * </p>
+     */
+    private String errorCode;
+    /**
+     * <p>
+     * A message describing the error.
+     * </p>
+     */
+    private String errorMessage;
+
+    /**
+     * <p>
+     * The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in the
+     * update request <code>Detector</code> object.)
+     * </p>
+     * 
+     * @param messageId
+     *        The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in
+     *        the update request <code>Detector</code> object.)
+     */
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * <p>
+     * The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in the
+     * update request <code>Detector</code> object.)
+     * </p>
+     * 
+     * @return The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in
+     *         the update request <code>Detector</code> object.)
+     */
+
+    public String getMessageId() {
+        return this.messageId;
+    }
+
+    /**
+     * <p>
+     * The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in the
+     * update request <code>Detector</code> object.)
+     * </p>
+     * 
+     * @param messageId
+     *        The "messageId" of the update request that caused the error. (The value of the <code>messageId</code> in
+     *        the update request <code>Detector</code> object.)
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchUpdateDetectorErrorEntry withMessageId(String messageId) {
+        setMessageId(messageId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The code of the error.
+     * </p>
+     * 
+     * @param errorCode
+     *        The code of the error.
+     * @see ErrorCode
+     */
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    /**
+     * <p>
+     * The code of the error.
+     * </p>
+     * 
+     * @return The code of the error.
+     * @see ErrorCode
+     */
+
+    public String getErrorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * <p>
+     * The code of the error.
+     * </p>
+     * 
+     * @param errorCode
+     *        The code of the error.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ErrorCode
+     */
+
+    public BatchUpdateDetectorErrorEntry withErrorCode(String errorCode) {
+        setErrorCode(errorCode);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The code of the error.
+     * </p>
+     * 
+     * @param errorCode
+     *        The code of the error.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ErrorCode
+     */
+
+    public BatchUpdateDetectorErrorEntry withErrorCode(ErrorCode errorCode) {
+        this.errorCode = errorCode.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * A message describing the error.
+     * </p>
+     * 
+     * @param errorMessage
+     *        A message describing the error.
+     */
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    /**
+     * <p>
+     * A message describing the error.
+     * </p>
+     * 
+     * @return A message describing the error.
+     */
+
+    public String getErrorMessage() {
+        return this.errorMessage;
+    }
+
+    /**
+     * <p>
+     * A message describing the error.
+     * </p>
+     * 
+     * @param errorMessage
+     *        A message describing the error.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchUpdateDetectorErrorEntry withErrorMessage(String errorMessage) {
+        setErrorMessage(errorMessage);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getMessageId() != null)
+            sb.append("MessageId: ").append(getMessageId()).append(",");
+        if (getErrorCode() != null)
+            sb.append("ErrorCode: ").append(getErrorCode()).append(",");
+        if (getErrorMessage() != null)
+            sb.append("ErrorMessage: ").append(getErrorMessage());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchUpdateDetectorErrorEntry == false)
+            return false;
+        BatchUpdateDetectorErrorEntry other = (BatchUpdateDetectorErrorEntry) obj;
+        if (other.getMessageId() == null ^ this.getMessageId() == null)
+            return false;
+        if (other.getMessageId() != null && other.getMessageId().equals(this.getMessageId()) == false)
+            return false;
+        if (other.getErrorCode() == null ^ this.getErrorCode() == null)
+            return false;
+        if (other.getErrorCode() != null && other.getErrorCode().equals(this.getErrorCode()) == false)
+            return false;
+        if (other.getErrorMessage() == null ^ this.getErrorMessage() == null)
+            return false;
+        if (other.getErrorMessage() != null && other.getErrorMessage().equals(this.getErrorMessage()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getMessageId() == null) ? 0 : getMessageId().hashCode());
+        hashCode = prime * hashCode + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
+        hashCode = prime * hashCode + ((getErrorMessage() == null) ? 0 : getErrorMessage().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchUpdateDetectorErrorEntry clone() {
+        try {
+            return (BatchUpdateDetectorErrorEntry) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.BatchUpdateDetectorErrorEntryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorRequest.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorRequest.java
new file mode 100644
index 000000000000..ddb9a1139d57
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorRequest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetector" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchUpdateDetectorRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The list of detectors (instances) to be updated, along with the values to be updated.
+     * </p>
+     */
+    private java.util.List<UpdateDetectorRequest> detectors;
+
+    /**
+     * <p>
+     * The list of detectors (instances) to be updated, along with the values to be updated.
+     * </p>
+     * 
+     * @return The list of detectors (instances) to be updated, along with the values to be updated.
+     */
+
+    public java.util.List<UpdateDetectorRequest> getDetectors() {
+        return detectors;
+    }
+
+    /**
+     * <p>
+     * The list of detectors (instances) to be updated, along with the values to be updated.
+     * </p>
+     * 
+     * @param detectors
+     *        The list of detectors (instances) to be updated, along with the values to be updated.
+     */
+
+    public void setDetectors(java.util.Collection<UpdateDetectorRequest> detectors) {
+        if (detectors == null) {
+            this.detectors = null;
+            return;
+        }
+
+        this.detectors = new java.util.ArrayList<UpdateDetectorRequest>(detectors);
+    }
+
+    /**
+     * <p>
+     * The list of detectors (instances) to be updated, along with the values to be updated.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setDetectors(java.util.Collection)} or {@link #withDetectors(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param detectors
+     *        The list of detectors (instances) to be updated, along with the values to be updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchUpdateDetectorRequest withDetectors(UpdateDetectorRequest... detectors) {
+        if (this.detectors == null) {
+            setDetectors(new java.util.ArrayList<UpdateDetectorRequest>(detectors.length));
+        }
+        for (UpdateDetectorRequest ele : detectors) {
+            this.detectors.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The list of detectors (instances) to be updated, along with the values to be updated.
+     * </p>
+     * 
+     * @param detectors
+     *        The list of detectors (instances) to be updated, along with the values to be updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchUpdateDetectorRequest withDetectors(java.util.Collection<UpdateDetectorRequest> detectors) {
+        setDetectors(detectors);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectors() != null)
+            sb.append("Detectors: ").append(getDetectors());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchUpdateDetectorRequest == false)
+            return false;
+        BatchUpdateDetectorRequest other = (BatchUpdateDetectorRequest) obj;
+        if (other.getDetectors() == null ^ this.getDetectors() == null)
+            return false;
+        if (other.getDetectors() != null && other.getDetectors().equals(this.getDetectors()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectors() == null) ? 0 : getDetectors().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchUpdateDetectorRequest clone() {
+        return (BatchUpdateDetectorRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorResult.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorResult.java
new file mode 100644
index 000000000000..07244821090e
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/BatchUpdateDetectorResult.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/BatchUpdateDetector" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchUpdateDetectorResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * A list of those detector updates which resulted in errors. (The specific update did not occur if an error is
+     * listed here.)
+     * </p>
+     */
+    private java.util.List<BatchUpdateDetectorErrorEntry> batchUpdateDetectorErrorEntries;
+
+    /**
+     * <p>
+     * A list of those detector updates which resulted in errors. (The specific update did not occur if an error is
+     * listed here.)
+     * </p>
+     * 
+     * @return A list of those detector updates which resulted in errors. (The specific update did not occur if an error
+     *         is listed here.)
+     */
+
+    public java.util.List<BatchUpdateDetectorErrorEntry> getBatchUpdateDetectorErrorEntries() {
+        return batchUpdateDetectorErrorEntries;
+    }
+
+    /**
+     * <p>
+     * A list of those detector updates which resulted in errors. (The specific update did not occur if an error is
+     * listed here.)
+     * </p>
+     * 
+     * @param batchUpdateDetectorErrorEntries
+     *        A list of those detector updates which resulted in errors. (The specific update did not occur if an error
+     *        is listed here.)
+     */
+
+    public void setBatchUpdateDetectorErrorEntries(java.util.Collection<BatchUpdateDetectorErrorEntry> batchUpdateDetectorErrorEntries) {
+        if (batchUpdateDetectorErrorEntries == null) {
+            this.batchUpdateDetectorErrorEntries = null;
+            return;
+        }
+
+        this.batchUpdateDetectorErrorEntries = new java.util.ArrayList<BatchUpdateDetectorErrorEntry>(batchUpdateDetectorErrorEntries);
+    }
+
+    /**
+     * <p>
+     * A list of those detector updates which resulted in errors. (The specific update did not occur if an error is
+     * listed here.)
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setBatchUpdateDetectorErrorEntries(java.util.Collection)} or
+     * {@link #withBatchUpdateDetectorErrorEntries(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param batchUpdateDetectorErrorEntries
+     *        A list of those detector updates which resulted in errors. (The specific update did not occur if an error
+     *        is listed here.)
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchUpdateDetectorResult withBatchUpdateDetectorErrorEntries(BatchUpdateDetectorErrorEntry... batchUpdateDetectorErrorEntries) {
+        if (this.batchUpdateDetectorErrorEntries == null) {
+            setBatchUpdateDetectorErrorEntries(new java.util.ArrayList<BatchUpdateDetectorErrorEntry>(batchUpdateDetectorErrorEntries.length));
+        }
+        for (BatchUpdateDetectorErrorEntry ele : batchUpdateDetectorErrorEntries) {
+            this.batchUpdateDetectorErrorEntries.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * A list of those detector updates which resulted in errors. (The specific update did not occur if an error is
+     * listed here.)
+     * </p>
+     * 
+     * @param batchUpdateDetectorErrorEntries
+     *        A list of those detector updates which resulted in errors. (The specific update did not occur if an error
+     *        is listed here.)
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchUpdateDetectorResult withBatchUpdateDetectorErrorEntries(java.util.Collection<BatchUpdateDetectorErrorEntry> batchUpdateDetectorErrorEntries) {
+        setBatchUpdateDetectorErrorEntries(batchUpdateDetectorErrorEntries);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBatchUpdateDetectorErrorEntries() != null)
+            sb.append("BatchUpdateDetectorErrorEntries: ").append(getBatchUpdateDetectorErrorEntries());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchUpdateDetectorResult == false)
+            return false;
+        BatchUpdateDetectorResult other = (BatchUpdateDetectorResult) obj;
+        if (other.getBatchUpdateDetectorErrorEntries() == null ^ this.getBatchUpdateDetectorErrorEntries() == null)
+            return false;
+        if (other.getBatchUpdateDetectorErrorEntries() != null
+                && other.getBatchUpdateDetectorErrorEntries().equals(this.getBatchUpdateDetectorErrorEntries()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBatchUpdateDetectorErrorEntries() == null) ? 0 : getBatchUpdateDetectorErrorEntries().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchUpdateDetectorResult clone() {
+        try {
+            return (BatchUpdateDetectorResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DescribeDetectorRequest.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DescribeDetectorRequest.java
new file mode 100644
index 000000000000..57cae6fc5f49
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DescribeDetectorRequest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DescribeDetector" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeDetectorRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model whose detectors (instances) you want information about.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * A filter used to limit results to detectors (instances) created because of the given key ID.
+     * </p>
+     */
+    private String keyValue;
+
+    /**
+     * <p>
+     * The name of the detector model whose detectors (instances) you want information about.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model whose detectors (instances) you want information about.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model whose detectors (instances) you want information about.
+     * </p>
+     * 
+     * @return The name of the detector model whose detectors (instances) you want information about.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model whose detectors (instances) you want information about.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model whose detectors (instances) you want information about.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeDetectorRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A filter used to limit results to detectors (instances) created because of the given key ID.
+     * </p>
+     * 
+     * @param keyValue
+     *        A filter used to limit results to detectors (instances) created because of the given key ID.
+     */
+
+    public void setKeyValue(String keyValue) {
+        this.keyValue = keyValue;
+    }
+
+    /**
+     * <p>
+     * A filter used to limit results to detectors (instances) created because of the given key ID.
+     * </p>
+     * 
+     * @return A filter used to limit results to detectors (instances) created because of the given key ID.
+     */
+
+    public String getKeyValue() {
+        return this.keyValue;
+    }
+
+    /**
+     * <p>
+     * A filter used to limit results to detectors (instances) created because of the given key ID.
+     * </p>
+     * 
+     * @param keyValue
+     *        A filter used to limit results to detectors (instances) created because of the given key ID.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeDetectorRequest withKeyValue(String keyValue) {
+        setKeyValue(keyValue);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getKeyValue() != null)
+            sb.append("KeyValue: ").append(getKeyValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeDetectorRequest == false)
+            return false;
+        DescribeDetectorRequest other = (DescribeDetectorRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getKeyValue() == null ^ this.getKeyValue() == null)
+            return false;
+        if (other.getKeyValue() != null && other.getKeyValue().equals(this.getKeyValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getKeyValue() == null) ? 0 : getKeyValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeDetectorRequest clone() {
+        return (DescribeDetectorRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DescribeDetectorResult.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DescribeDetectorResult.java
new file mode 100644
index 000000000000..49ef201c0a99
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DescribeDetectorResult.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DescribeDetector" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeDetectorResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Information about the detector (instance).
+     * </p>
+     */
+    private Detector detector;
+
+    /**
+     * <p>
+     * Information about the detector (instance).
+     * </p>
+     * 
+     * @param detector
+     *        Information about the detector (instance).
+     */
+
+    public void setDetector(Detector detector) {
+        this.detector = detector;
+    }
+
+    /**
+     * <p>
+     * Information about the detector (instance).
+     * </p>
+     * 
+     * @return Information about the detector (instance).
+     */
+
+    public Detector getDetector() {
+        return this.detector;
+    }
+
+    /**
+     * <p>
+     * Information about the detector (instance).
+     * </p>
+     * 
+     * @param detector
+     *        Information about the detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeDetectorResult withDetector(Detector detector) {
+        setDetector(detector);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetector() != null)
+            sb.append("Detector: ").append(getDetector());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeDetectorResult == false)
+            return false;
+        DescribeDetectorResult other = (DescribeDetectorResult) obj;
+        if (other.getDetector() == null ^ this.getDetector() == null)
+            return false;
+        if (other.getDetector() != null && other.getDetector().equals(this.getDetector()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetector() == null) ? 0 : getDetector().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeDetectorResult clone() {
+        try {
+            return (DescribeDetectorResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Detector.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Detector.java
new file mode 100644
index 000000000000..6ab4f3220b8a
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Detector.java
@@ -0,0 +1,404 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the detector (instance).
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/Detector" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Detector implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     */
+    private String keyValue;
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     */
+    private String detectorModelVersion;
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     */
+    private DetectorState state;
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     */
+    private java.util.Date lastUpdateTime;
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model that created this detector (instance).
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @return The name of the detector model that created this detector (instance).
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model that created this detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Detector withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the key (identifying the device or system) that caused the creation of this detector
+     *        (instance).
+     */
+
+    public void setKeyValue(String keyValue) {
+        this.keyValue = keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     * 
+     * @return The value of the key (identifying the device or system) that caused the creation of this detector
+     *         (instance).
+     */
+
+    public String getKeyValue() {
+        return this.keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the key (identifying the device or system) that caused the creation of this detector
+     *        (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Detector withKeyValue(String keyValue) {
+        setKeyValue(keyValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model that created this detector (instance).
+     */
+
+    public void setDetectorModelVersion(String detectorModelVersion) {
+        this.detectorModelVersion = detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @return The version of the detector model that created this detector (instance).
+     */
+
+    public String getDetectorModelVersion() {
+        return this.detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model that created this detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Detector withDetectorModelVersion(String detectorModelVersion) {
+        setDetectorModelVersion(detectorModelVersion);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     * 
+     * @param state
+     *        The current state of the detector (instance).
+     */
+
+    public void setState(DetectorState state) {
+        this.state = state;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     * 
+     * @return The current state of the detector (instance).
+     */
+
+    public DetectorState getState() {
+        return this.state;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     * 
+     * @param state
+     *        The current state of the detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Detector withState(DetectorState state) {
+        setState(state);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector (instance) was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     * 
+     * @return The time the detector (instance) was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector (instance) was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Detector withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The time the detector (instance) was last updated.
+     */
+
+    public void setLastUpdateTime(java.util.Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     * 
+     * @return The time the detector (instance) was last updated.
+     */
+
+    public java.util.Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The time the detector (instance) was last updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Detector withLastUpdateTime(java.util.Date lastUpdateTime) {
+        setLastUpdateTime(lastUpdateTime);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getKeyValue() != null)
+            sb.append("KeyValue: ").append(getKeyValue()).append(",");
+        if (getDetectorModelVersion() != null)
+            sb.append("DetectorModelVersion: ").append(getDetectorModelVersion()).append(",");
+        if (getState() != null)
+            sb.append("State: ").append(getState()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getLastUpdateTime() != null)
+            sb.append("LastUpdateTime: ").append(getLastUpdateTime());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Detector == false)
+            return false;
+        Detector other = (Detector) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getKeyValue() == null ^ this.getKeyValue() == null)
+            return false;
+        if (other.getKeyValue() != null && other.getKeyValue().equals(this.getKeyValue()) == false)
+            return false;
+        if (other.getDetectorModelVersion() == null ^ this.getDetectorModelVersion() == null)
+            return false;
+        if (other.getDetectorModelVersion() != null && other.getDetectorModelVersion().equals(this.getDetectorModelVersion()) == false)
+            return false;
+        if (other.getState() == null ^ this.getState() == null)
+            return false;
+        if (other.getState() != null && other.getState().equals(this.getState()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getLastUpdateTime() == null ^ this.getLastUpdateTime() == null)
+            return false;
+        if (other.getLastUpdateTime() != null && other.getLastUpdateTime().equals(this.getLastUpdateTime()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getKeyValue() == null) ? 0 : getKeyValue().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelVersion() == null) ? 0 : getDetectorModelVersion().hashCode());
+        hashCode = prime * hashCode + ((getState() == null) ? 0 : getState().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Detector clone() {
+        try {
+            return (Detector) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.DetectorMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorState.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorState.java
new file mode 100644
index 000000000000..40f8e6cc689d
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorState.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the current state of the detector instance.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DetectorState" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorState implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     */
+    private String stateName;
+    /**
+     * <p>
+     * The current state of the detector's variables.
+     * </p>
+     */
+    private java.util.List<Variable> variables;
+    /**
+     * <p>
+     * The current state of the detector's timers.
+     * </p>
+     */
+    private java.util.List<Timer> timers;
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the state.
+     */
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @return The name of the state.
+     */
+
+    public String getStateName() {
+        return this.stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the state.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorState withStateName(String stateName) {
+        setStateName(stateName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's variables.
+     * </p>
+     * 
+     * @return The current state of the detector's variables.
+     */
+
+    public java.util.List<Variable> getVariables() {
+        return variables;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's variables.
+     * </p>
+     * 
+     * @param variables
+     *        The current state of the detector's variables.
+     */
+
+    public void setVariables(java.util.Collection<Variable> variables) {
+        if (variables == null) {
+            this.variables = null;
+            return;
+        }
+
+        this.variables = new java.util.ArrayList<Variable>(variables);
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's variables.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setVariables(java.util.Collection)} or {@link #withVariables(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param variables
+     *        The current state of the detector's variables.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorState withVariables(Variable... variables) {
+        if (this.variables == null) {
+            setVariables(new java.util.ArrayList<Variable>(variables.length));
+        }
+        for (Variable ele : variables) {
+            this.variables.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's variables.
+     * </p>
+     * 
+     * @param variables
+     *        The current state of the detector's variables.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorState withVariables(java.util.Collection<Variable> variables) {
+        setVariables(variables);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's timers.
+     * </p>
+     * 
+     * @return The current state of the detector's timers.
+     */
+
+    public java.util.List<Timer> getTimers() {
+        return timers;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's timers.
+     * </p>
+     * 
+     * @param timers
+     *        The current state of the detector's timers.
+     */
+
+    public void setTimers(java.util.Collection<Timer> timers) {
+        if (timers == null) {
+            this.timers = null;
+            return;
+        }
+
+        this.timers = new java.util.ArrayList<Timer>(timers);
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's timers.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTimers(java.util.Collection)} or {@link #withTimers(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param timers
+     *        The current state of the detector's timers.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorState withTimers(Timer... timers) {
+        if (this.timers == null) {
+            setTimers(new java.util.ArrayList<Timer>(timers.length));
+        }
+        for (Timer ele : timers) {
+            this.timers.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector's timers.
+     * </p>
+     * 
+     * @param timers
+     *        The current state of the detector's timers.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorState withTimers(java.util.Collection<Timer> timers) {
+        setTimers(timers);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getStateName() != null)
+            sb.append("StateName: ").append(getStateName()).append(",");
+        if (getVariables() != null)
+            sb.append("Variables: ").append(getVariables()).append(",");
+        if (getTimers() != null)
+            sb.append("Timers: ").append(getTimers());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorState == false)
+            return false;
+        DetectorState other = (DetectorState) obj;
+        if (other.getStateName() == null ^ this.getStateName() == null)
+            return false;
+        if (other.getStateName() != null && other.getStateName().equals(this.getStateName()) == false)
+            return false;
+        if (other.getVariables() == null ^ this.getVariables() == null)
+            return false;
+        if (other.getVariables() != null && other.getVariables().equals(this.getVariables()) == false)
+            return false;
+        if (other.getTimers() == null ^ this.getTimers() == null)
+            return false;
+        if (other.getTimers() != null && other.getTimers().equals(this.getTimers()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getStateName() == null) ? 0 : getStateName().hashCode());
+        hashCode = prime * hashCode + ((getVariables() == null) ? 0 : getVariables().hashCode());
+        hashCode = prime * hashCode + ((getTimers() == null) ? 0 : getTimers().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorState clone() {
+        try {
+            return (DetectorState) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.DetectorStateMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorStateDefinition.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorStateDefinition.java
new file mode 100644
index 000000000000..45fa5c9f4339
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorStateDefinition.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The new state, variable values and timer settings of the detector (instance).
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DetectorStateDefinition"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorStateDefinition implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the new state of the detector (instance).
+     * </p>
+     */
+    private String stateName;
+    /**
+     * <p>
+     * The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * </p>
+     */
+    private java.util.List<VariableDefinition> variables;
+    /**
+     * <p>
+     * The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout
+     * event will not occur.
+     * </p>
+     */
+    private java.util.List<TimerDefinition> timers;
+
+    /**
+     * <p>
+     * The name of the new state of the detector (instance).
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the new state of the detector (instance).
+     */
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the new state of the detector (instance).
+     * </p>
+     * 
+     * @return The name of the new state of the detector (instance).
+     */
+
+    public String getStateName() {
+        return this.stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the new state of the detector (instance).
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the new state of the detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorStateDefinition withStateName(String stateName) {
+        setStateName(stateName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * </p>
+     * 
+     * @return The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     */
+
+    public java.util.List<VariableDefinition> getVariables() {
+        return variables;
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * </p>
+     * 
+     * @param variables
+     *        The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     */
+
+    public void setVariables(java.util.Collection<VariableDefinition> variables) {
+        if (variables == null) {
+            this.variables = null;
+            return;
+        }
+
+        this.variables = new java.util.ArrayList<VariableDefinition>(variables);
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setVariables(java.util.Collection)} or {@link #withVariables(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param variables
+     *        The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorStateDefinition withVariables(VariableDefinition... variables) {
+        if (this.variables == null) {
+            setVariables(new java.util.ArrayList<VariableDefinition>(variables.length));
+        }
+        for (VariableDefinition ele : variables) {
+            this.variables.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * </p>
+     * 
+     * @param variables
+     *        The new values of the detector's variables. Any variable whose value is not specified will be cleared.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorStateDefinition withVariables(java.util.Collection<VariableDefinition> variables) {
+        setVariables(variables);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout
+     * event will not occur.
+     * </p>
+     * 
+     * @return The new values of the detector's timers. Any timer whose value is not specified will be cleared and its
+     *         timeout event will not occur.
+     */
+
+    public java.util.List<TimerDefinition> getTimers() {
+        return timers;
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout
+     * event will not occur.
+     * </p>
+     * 
+     * @param timers
+     *        The new values of the detector's timers. Any timer whose value is not specified will be cleared and its
+     *        timeout event will not occur.
+     */
+
+    public void setTimers(java.util.Collection<TimerDefinition> timers) {
+        if (timers == null) {
+            this.timers = null;
+            return;
+        }
+
+        this.timers = new java.util.ArrayList<TimerDefinition>(timers);
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout
+     * event will not occur.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTimers(java.util.Collection)} or {@link #withTimers(java.util.Collection)} if you want to override the
+     * existing values.
+     * </p>
+     * 
+     * @param timers
+     *        The new values of the detector's timers. Any timer whose value is not specified will be cleared and its
+     *        timeout event will not occur.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorStateDefinition withTimers(TimerDefinition... timers) {
+        if (this.timers == null) {
+            setTimers(new java.util.ArrayList<TimerDefinition>(timers.length));
+        }
+        for (TimerDefinition ele : timers) {
+            this.timers.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout
+     * event will not occur.
+     * </p>
+     * 
+     * @param timers
+     *        The new values of the detector's timers. Any timer whose value is not specified will be cleared and its
+     *        timeout event will not occur.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorStateDefinition withTimers(java.util.Collection<TimerDefinition> timers) {
+        setTimers(timers);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getStateName() != null)
+            sb.append("StateName: ").append(getStateName()).append(",");
+        if (getVariables() != null)
+            sb.append("Variables: ").append(getVariables()).append(",");
+        if (getTimers() != null)
+            sb.append("Timers: ").append(getTimers());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorStateDefinition == false)
+            return false;
+        DetectorStateDefinition other = (DetectorStateDefinition) obj;
+        if (other.getStateName() == null ^ this.getStateName() == null)
+            return false;
+        if (other.getStateName() != null && other.getStateName().equals(this.getStateName()) == false)
+            return false;
+        if (other.getVariables() == null ^ this.getVariables() == null)
+            return false;
+        if (other.getVariables() != null && other.getVariables().equals(this.getVariables()) == false)
+            return false;
+        if (other.getTimers() == null ^ this.getTimers() == null)
+            return false;
+        if (other.getTimers() != null && other.getTimers().equals(this.getTimers()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getStateName() == null) ? 0 : getStateName().hashCode());
+        hashCode = prime * hashCode + ((getVariables() == null) ? 0 : getVariables().hashCode());
+        hashCode = prime * hashCode + ((getTimers() == null) ? 0 : getTimers().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorStateDefinition clone() {
+        try {
+            return (DetectorStateDefinition) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.DetectorStateDefinitionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorStateSummary.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorStateSummary.java
new file mode 100644
index 000000000000..20a5e66619b5
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorStateSummary.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the detector state.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DetectorStateSummary"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorStateSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     */
+    private String stateName;
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the state.
+     */
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @return The name of the state.
+     */
+
+    public String getStateName() {
+        return this.stateName;
+    }
+
+    /**
+     * <p>
+     * The name of the state.
+     * </p>
+     * 
+     * @param stateName
+     *        The name of the state.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorStateSummary withStateName(String stateName) {
+        setStateName(stateName);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getStateName() != null)
+            sb.append("StateName: ").append(getStateName());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorStateSummary == false)
+            return false;
+        DetectorStateSummary other = (DetectorStateSummary) obj;
+        if (other.getStateName() == null ^ this.getStateName() == null)
+            return false;
+        if (other.getStateName() != null && other.getStateName().equals(this.getStateName()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getStateName() == null) ? 0 : getStateName().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorStateSummary clone() {
+        try {
+            return (DetectorStateSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.DetectorStateSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorSummary.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorSummary.java
new file mode 100644
index 000000000000..c1b1a1735489
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/DetectorSummary.java
@@ -0,0 +1,404 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about the detector (instance).
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/DetectorSummary" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorSummary implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     */
+    private String keyValue;
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     */
+    private String detectorModelVersion;
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     */
+    private DetectorStateSummary state;
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     */
+    private java.util.Date lastUpdateTime;
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model that created this detector (instance).
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @return The name of the detector model that created this detector (instance).
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model that created this detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorSummary withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the key (identifying the device or system) that caused the creation of this detector
+     *        (instance).
+     */
+
+    public void setKeyValue(String keyValue) {
+        this.keyValue = keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     * 
+     * @return The value of the key (identifying the device or system) that caused the creation of this detector
+     *         (instance).
+     */
+
+    public String getKeyValue() {
+        return this.keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the key (identifying the device or system) that caused the creation of this detector (instance).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the key (identifying the device or system) that caused the creation of this detector
+     *        (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorSummary withKeyValue(String keyValue) {
+        setKeyValue(keyValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model that created this detector (instance).
+     */
+
+    public void setDetectorModelVersion(String detectorModelVersion) {
+        this.detectorModelVersion = detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @return The version of the detector model that created this detector (instance).
+     */
+
+    public String getDetectorModelVersion() {
+        return this.detectorModelVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the detector model that created this detector (instance).
+     * </p>
+     * 
+     * @param detectorModelVersion
+     *        The version of the detector model that created this detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorSummary withDetectorModelVersion(String detectorModelVersion) {
+        setDetectorModelVersion(detectorModelVersion);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     * 
+     * @param state
+     *        The current state of the detector (instance).
+     */
+
+    public void setState(DetectorStateSummary state) {
+        this.state = state;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     * 
+     * @return The current state of the detector (instance).
+     */
+
+    public DetectorStateSummary getState() {
+        return this.state;
+    }
+
+    /**
+     * <p>
+     * The current state of the detector (instance).
+     * </p>
+     * 
+     * @param state
+     *        The current state of the detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorSummary withState(DetectorStateSummary state) {
+        setState(state);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector (instance) was created.
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     * 
+     * @return The time the detector (instance) was created.
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        The time the detector (instance) was created.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorSummary withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The time the detector (instance) was last updated.
+     */
+
+    public void setLastUpdateTime(java.util.Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     * 
+     * @return The time the detector (instance) was last updated.
+     */
+
+    public java.util.Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    /**
+     * <p>
+     * The time the detector (instance) was last updated.
+     * </p>
+     * 
+     * @param lastUpdateTime
+     *        The time the detector (instance) was last updated.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DetectorSummary withLastUpdateTime(java.util.Date lastUpdateTime) {
+        setLastUpdateTime(lastUpdateTime);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getKeyValue() != null)
+            sb.append("KeyValue: ").append(getKeyValue()).append(",");
+        if (getDetectorModelVersion() != null)
+            sb.append("DetectorModelVersion: ").append(getDetectorModelVersion()).append(",");
+        if (getState() != null)
+            sb.append("State: ").append(getState()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getLastUpdateTime() != null)
+            sb.append("LastUpdateTime: ").append(getLastUpdateTime());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DetectorSummary == false)
+            return false;
+        DetectorSummary other = (DetectorSummary) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getKeyValue() == null ^ this.getKeyValue() == null)
+            return false;
+        if (other.getKeyValue() != null && other.getKeyValue().equals(this.getKeyValue()) == false)
+            return false;
+        if (other.getDetectorModelVersion() == null ^ this.getDetectorModelVersion() == null)
+            return false;
+        if (other.getDetectorModelVersion() != null && other.getDetectorModelVersion().equals(this.getDetectorModelVersion()) == false)
+            return false;
+        if (other.getState() == null ^ this.getState() == null)
+            return false;
+        if (other.getState() != null && other.getState().equals(this.getState()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getLastUpdateTime() == null ^ this.getLastUpdateTime() == null)
+            return false;
+        if (other.getLastUpdateTime() != null && other.getLastUpdateTime().equals(this.getLastUpdateTime()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getKeyValue() == null) ? 0 : getKeyValue().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelVersion() == null) ? 0 : getDetectorModelVersion().hashCode());
+        hashCode = prime * hashCode + ((getState() == null) ? 0 : getState().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getLastUpdateTime() == null) ? 0 : getLastUpdateTime().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DetectorSummary clone() {
+        try {
+            return (DetectorSummary) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.DetectorSummaryMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ErrorCode.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ErrorCode.java
new file mode 100644
index 000000000000..6f9ad4d50faa
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ErrorCode.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum ErrorCode {
+
+    ResourceNotFoundException("ResourceNotFoundException"),
+    InvalidRequestException("InvalidRequestException"),
+    InternalFailureException("InternalFailureException"),
+    ServiceUnavailableException("ServiceUnavailableException"),
+    ThrottlingException("ThrottlingException");
+
+    private String value;
+
+    private ErrorCode(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return ErrorCode corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static ErrorCode fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (ErrorCode enumEntry : ErrorCode.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/InternalFailureException.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/InternalFailureException.java
new file mode 100644
index 000000000000..c3ac9021dc99
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/InternalFailureException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * An internal failure occured.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InternalFailureException extends com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InternalFailureException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InternalFailureException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/InvalidRequestException.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/InvalidRequestException.java
new file mode 100644
index 000000000000..f2b464896a94
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/InvalidRequestException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The request was invalid.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class InvalidRequestException extends com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new InvalidRequestException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public InvalidRequestException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ListDetectorsRequest.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ListDetectorsRequest.java
new file mode 100644
index 000000000000..0e406f44edb3
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ListDetectorsRequest.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/ListDetectors" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the detector model whose instances you want to list.
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * A filter that limits results to those detectors (instances) in the given state.
+     * </p>
+     */
+    private String stateName;
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     */
+    private String nextToken;
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     */
+    private Integer maxResults;
+
+    /**
+     * <p>
+     * The name of the detector model whose instances you want to list.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model whose instances you want to list.
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model whose instances you want to list.
+     * </p>
+     * 
+     * @return The name of the detector model whose instances you want to list.
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model whose instances you want to list.
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model whose instances you want to list.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A filter that limits results to those detectors (instances) in the given state.
+     * </p>
+     * 
+     * @param stateName
+     *        A filter that limits results to those detectors (instances) in the given state.
+     */
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    /**
+     * <p>
+     * A filter that limits results to those detectors (instances) in the given state.
+     * </p>
+     * 
+     * @return A filter that limits results to those detectors (instances) in the given state.
+     */
+
+    public String getStateName() {
+        return this.stateName;
+    }
+
+    /**
+     * <p>
+     * A filter that limits results to those detectors (instances) in the given state.
+     * </p>
+     * 
+     * @param stateName
+     *        A filter that limits results to those detectors (instances) in the given state.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsRequest withStateName(String stateName) {
+        setStateName(stateName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @return The token for the next set of results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * The token for the next set of results.
+     * </p>
+     * 
+     * @param nextToken
+     *        The token for the next set of results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     */
+
+    public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @return The maximum number of results to return at one time.
+     */
+
+    public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return at one time.
+     * </p>
+     * 
+     * @param maxResults
+     *        The maximum number of results to return at one time.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsRequest withMaxResults(Integer maxResults) {
+        setMaxResults(maxResults);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getStateName() != null)
+            sb.append("StateName: ").append(getStateName()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken()).append(",");
+        if (getMaxResults() != null)
+            sb.append("MaxResults: ").append(getMaxResults());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListDetectorsRequest == false)
+            return false;
+        ListDetectorsRequest other = (ListDetectorsRequest) obj;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getStateName() == null ^ this.getStateName() == null)
+            return false;
+        if (other.getStateName() != null && other.getStateName().equals(this.getStateName()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        if (other.getMaxResults() == null ^ this.getMaxResults() == null)
+            return false;
+        if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getStateName() == null) ? 0 : getStateName().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListDetectorsRequest clone() {
+        return (ListDetectorsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ListDetectorsResult.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ListDetectorsResult.java
new file mode 100644
index 000000000000..8b4901cc8078
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ListDetectorsResult.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/ListDetectors" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * A list of summary information about the detectors (instances).
+     * </p>
+     */
+    private java.util.List<DetectorSummary> detectorSummaries;
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * A list of summary information about the detectors (instances).
+     * </p>
+     * 
+     * @return A list of summary information about the detectors (instances).
+     */
+
+    public java.util.List<DetectorSummary> getDetectorSummaries() {
+        return detectorSummaries;
+    }
+
+    /**
+     * <p>
+     * A list of summary information about the detectors (instances).
+     * </p>
+     * 
+     * @param detectorSummaries
+     *        A list of summary information about the detectors (instances).
+     */
+
+    public void setDetectorSummaries(java.util.Collection<DetectorSummary> detectorSummaries) {
+        if (detectorSummaries == null) {
+            this.detectorSummaries = null;
+            return;
+        }
+
+        this.detectorSummaries = new java.util.ArrayList<DetectorSummary>(detectorSummaries);
+    }
+
+    /**
+     * <p>
+     * A list of summary information about the detectors (instances).
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setDetectorSummaries(java.util.Collection)} or {@link #withDetectorSummaries(java.util.Collection)} if
+     * you want to override the existing values.
+     * </p>
+     * 
+     * @param detectorSummaries
+     *        A list of summary information about the detectors (instances).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsResult withDetectorSummaries(DetectorSummary... detectorSummaries) {
+        if (this.detectorSummaries == null) {
+            setDetectorSummaries(new java.util.ArrayList<DetectorSummary>(detectorSummaries.length));
+        }
+        for (DetectorSummary ele : detectorSummaries) {
+            this.detectorSummaries.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * A list of summary information about the detectors (instances).
+     * </p>
+     * 
+     * @param detectorSummaries
+     *        A list of summary information about the detectors (instances).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsResult withDetectorSummaries(java.util.Collection<DetectorSummary> detectorSummaries) {
+        setDetectorSummaries(detectorSummaries);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * </p>
+     * 
+     * @param nextToken
+     *        A token to retrieve the next set of results, or <code>null</code> if there are no additional results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListDetectorsResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDetectorSummaries() != null)
+            sb.append("DetectorSummaries: ").append(getDetectorSummaries()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListDetectorsResult == false)
+            return false;
+        ListDetectorsResult other = (ListDetectorsResult) obj;
+        if (other.getDetectorSummaries() == null ^ this.getDetectorSummaries() == null)
+            return false;
+        if (other.getDetectorSummaries() != null && other.getDetectorSummaries().equals(this.getDetectorSummaries()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDetectorSummaries() == null) ? 0 : getDetectorSummaries().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListDetectorsResult clone() {
+        try {
+            return (ListDetectorsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Message.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Message.java
new file mode 100644
index 000000000000..f920e77e8041
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Message.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information about a message.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/Message" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Message implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     * </p>
+     */
+    private String messageId;
+    /**
+     * <p>
+     * The name of the input into which the message payload will be transformed.
+     * </p>
+     */
+    private String inputName;
+    /**
+     * <p>
+     * The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in
+     * which case you must decode it).
+     * </p>
+     */
+    private java.nio.ByteBuffer payload;
+
+    /**
+     * <p>
+     * The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     * </p>
+     * 
+     * @param messageId
+     *        The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     */
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * <p>
+     * The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     * </p>
+     * 
+     * @return The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     */
+
+    public String getMessageId() {
+        return this.messageId;
+    }
+
+    /**
+     * <p>
+     * The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     * </p>
+     * 
+     * @param messageId
+     *        The ID you wish to assign to the message. Each "messageId" must be unique within each batch sent.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Message withMessageId(String messageId) {
+        setMessageId(messageId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the input into which the message payload will be transformed.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input into which the message payload will be transformed.
+     */
+
+    public void setInputName(String inputName) {
+        this.inputName = inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input into which the message payload will be transformed.
+     * </p>
+     * 
+     * @return The name of the input into which the message payload will be transformed.
+     */
+
+    public String getInputName() {
+        return this.inputName;
+    }
+
+    /**
+     * <p>
+     * The name of the input into which the message payload will be transformed.
+     * </p>
+     * 
+     * @param inputName
+     *        The name of the input into which the message payload will be transformed.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Message withInputName(String inputName) {
+        setInputName(inputName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in
+     * which case you must decode it).
+     * </p>
+     * <p>
+     * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
+     * Users of the SDK should not perform Base64 encoding on this field.
+     * </p>
+     * <p>
+     * Warning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will
+     * be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or
+     * ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future
+     * major version of the SDK.
+     * </p>
+     * 
+     * @param payload
+     *        The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data
+     *        (in which case you must decode it).
+     */
+
+    public void setPayload(java.nio.ByteBuffer payload) {
+        this.payload = payload;
+    }
+
+    /**
+     * <p>
+     * The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in
+     * which case you must decode it).
+     * </p>
+     * <p>
+     * {@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend
+     * using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent
+     * {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}.
+     * Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the
+     * {@code position}.
+     * </p>
+     * 
+     * @return The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary
+     *         data (in which case you must decode it).
+     */
+
+    public java.nio.ByteBuffer getPayload() {
+        return this.payload;
+    }
+
+    /**
+     * <p>
+     * The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in
+     * which case you must decode it).
+     * </p>
+     * <p>
+     * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
+     * Users of the SDK should not perform Base64 encoding on this field.
+     * </p>
+     * <p>
+     * Warning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will
+     * be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or
+     * ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future
+     * major version of the SDK.
+     * </p>
+     * 
+     * @param payload
+     *        The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data
+     *        (in which case you must decode it).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Message withPayload(java.nio.ByteBuffer payload) {
+        setPayload(payload);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getMessageId() != null)
+            sb.append("MessageId: ").append(getMessageId()).append(",");
+        if (getInputName() != null)
+            sb.append("InputName: ").append(getInputName()).append(",");
+        if (getPayload() != null)
+            sb.append("Payload: ").append(getPayload());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Message == false)
+            return false;
+        Message other = (Message) obj;
+        if (other.getMessageId() == null ^ this.getMessageId() == null)
+            return false;
+        if (other.getMessageId() != null && other.getMessageId().equals(this.getMessageId()) == false)
+            return false;
+        if (other.getInputName() == null ^ this.getInputName() == null)
+            return false;
+        if (other.getInputName() != null && other.getInputName().equals(this.getInputName()) == false)
+            return false;
+        if (other.getPayload() == null ^ this.getPayload() == null)
+            return false;
+        if (other.getPayload() != null && other.getPayload().equals(this.getPayload()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getMessageId() == null) ? 0 : getMessageId().hashCode());
+        hashCode = prime * hashCode + ((getInputName() == null) ? 0 : getInputName().hashCode());
+        hashCode = prime * hashCode + ((getPayload() == null) ? 0 : getPayload().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Message clone() {
+        try {
+            return (Message) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.MessageMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ResourceNotFoundException.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ResourceNotFoundException.java
new file mode 100644
index 000000000000..d7bd9921d103
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ResourceNotFoundException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The resource was not found.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ResourceNotFoundException extends com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ResourceNotFoundException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ServiceUnavailableException.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ServiceUnavailableException.java
new file mode 100644
index 000000000000..691927f9cfff
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ServiceUnavailableException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The service is currently unavailable.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ServiceUnavailableException extends com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ServiceUnavailableException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ServiceUnavailableException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ThrottlingException.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ThrottlingException.java
new file mode 100644
index 000000000000..4a228e05895e
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/ThrottlingException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The request could not be completed due to throttling.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ThrottlingException extends com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new ThrottlingException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public ThrottlingException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Timer.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Timer.java
new file mode 100644
index 000000000000..7dd9dff2e3bd
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Timer.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The current state of a timer.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/Timer" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Timer implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     */
+    private String name;
+    /**
+     * <p>
+     * The number of seconds which have elapsed on the timer.
+     * </p>
+     */
+    private java.util.Date timestamp;
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @param name
+     *        The name of the timer.
+     */
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @return The name of the timer.
+     */
+
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @param name
+     *        The name of the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Timer withName(String name) {
+        setName(name);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The number of seconds which have elapsed on the timer.
+     * </p>
+     * 
+     * @param timestamp
+     *        The number of seconds which have elapsed on the timer.
+     */
+
+    public void setTimestamp(java.util.Date timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * <p>
+     * The number of seconds which have elapsed on the timer.
+     * </p>
+     * 
+     * @return The number of seconds which have elapsed on the timer.
+     */
+
+    public java.util.Date getTimestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * <p>
+     * The number of seconds which have elapsed on the timer.
+     * </p>
+     * 
+     * @param timestamp
+     *        The number of seconds which have elapsed on the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Timer withTimestamp(java.util.Date timestamp) {
+        setTimestamp(timestamp);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getName() != null)
+            sb.append("Name: ").append(getName()).append(",");
+        if (getTimestamp() != null)
+            sb.append("Timestamp: ").append(getTimestamp());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Timer == false)
+            return false;
+        Timer other = (Timer) obj;
+        if (other.getName() == null ^ this.getName() == null)
+            return false;
+        if (other.getName() != null && other.getName().equals(this.getName()) == false)
+            return false;
+        if (other.getTimestamp() == null ^ this.getTimestamp() == null)
+            return false;
+        if (other.getTimestamp() != null && other.getTimestamp().equals(this.getTimestamp()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getTimestamp() == null) ? 0 : getTimestamp().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Timer clone() {
+        try {
+            return (Timer) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.TimerMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/TimerDefinition.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/TimerDefinition.java
new file mode 100644
index 000000000000..53a90b55d3bd
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/TimerDefinition.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The new setting of a timer.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/TimerDefinition" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TimerDefinition implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     */
+    private String name;
+    /**
+     * <p>
+     * The new setting of the timer (the number of seconds before the timer elapses).
+     * </p>
+     */
+    private Integer seconds;
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @param name
+     *        The name of the timer.
+     */
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @return The name of the timer.
+     */
+
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * <p>
+     * The name of the timer.
+     * </p>
+     * 
+     * @param name
+     *        The name of the timer.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TimerDefinition withName(String name) {
+        setName(name);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new setting of the timer (the number of seconds before the timer elapses).
+     * </p>
+     * 
+     * @param seconds
+     *        The new setting of the timer (the number of seconds before the timer elapses).
+     */
+
+    public void setSeconds(Integer seconds) {
+        this.seconds = seconds;
+    }
+
+    /**
+     * <p>
+     * The new setting of the timer (the number of seconds before the timer elapses).
+     * </p>
+     * 
+     * @return The new setting of the timer (the number of seconds before the timer elapses).
+     */
+
+    public Integer getSeconds() {
+        return this.seconds;
+    }
+
+    /**
+     * <p>
+     * The new setting of the timer (the number of seconds before the timer elapses).
+     * </p>
+     * 
+     * @param seconds
+     *        The new setting of the timer (the number of seconds before the timer elapses).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public TimerDefinition withSeconds(Integer seconds) {
+        setSeconds(seconds);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getName() != null)
+            sb.append("Name: ").append(getName()).append(",");
+        if (getSeconds() != null)
+            sb.append("Seconds: ").append(getSeconds());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof TimerDefinition == false)
+            return false;
+        TimerDefinition other = (TimerDefinition) obj;
+        if (other.getName() == null ^ this.getName() == null)
+            return false;
+        if (other.getName() != null && other.getName().equals(this.getName()) == false)
+            return false;
+        if (other.getSeconds() == null ^ this.getSeconds() == null)
+            return false;
+        if (other.getSeconds() != null && other.getSeconds().equals(this.getSeconds()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getSeconds() == null) ? 0 : getSeconds().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public TimerDefinition clone() {
+        try {
+            return (TimerDefinition) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.TimerDefinitionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/UpdateDetectorRequest.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/UpdateDetectorRequest.java
new file mode 100644
index 000000000000..da971152ba18
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/UpdateDetectorRequest.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Information used to update the detector (instance).
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/UpdateDetectorRequest"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateDetectorRequest implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each batch
+     * sent.
+     * </p>
+     */
+    private String messageId;
+    /**
+     * <p>
+     * The name of the detector model that created the detectors (instances).
+     * </p>
+     */
+    private String detectorModelName;
+    /**
+     * <p>
+     * The value of the input key attribute (identifying the device or system) that caused the creation of this detector
+     * (instance).
+     * </p>
+     */
+    private String keyValue;
+    /**
+     * <p>
+     * The new state, variable values, and timer settings of the detector (instance).
+     * </p>
+     */
+    private DetectorStateDefinition state;
+
+    /**
+     * <p>
+     * The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each batch
+     * sent.
+     * </p>
+     * 
+     * @param messageId
+     *        The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each
+     *        batch sent.
+     */
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * <p>
+     * The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each batch
+     * sent.
+     * </p>
+     * 
+     * @return The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each
+     *         batch sent.
+     */
+
+    public String getMessageId() {
+        return this.messageId;
+    }
+
+    /**
+     * <p>
+     * The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each batch
+     * sent.
+     * </p>
+     * 
+     * @param messageId
+     *        The ID you wish to assign to the detector update "message". Each "messageId" must be unique within each
+     *        batch sent.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorRequest withMessageId(String messageId) {
+        setMessageId(messageId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created the detectors (instances).
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model that created the detectors (instances).
+     */
+
+    public void setDetectorModelName(String detectorModelName) {
+        this.detectorModelName = detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created the detectors (instances).
+     * </p>
+     * 
+     * @return The name of the detector model that created the detectors (instances).
+     */
+
+    public String getDetectorModelName() {
+        return this.detectorModelName;
+    }
+
+    /**
+     * <p>
+     * The name of the detector model that created the detectors (instances).
+     * </p>
+     * 
+     * @param detectorModelName
+     *        The name of the detector model that created the detectors (instances).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorRequest withDetectorModelName(String detectorModelName) {
+        setDetectorModelName(detectorModelName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The value of the input key attribute (identifying the device or system) that caused the creation of this detector
+     * (instance).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the input key attribute (identifying the device or system) that caused the creation of this
+     *        detector (instance).
+     */
+
+    public void setKeyValue(String keyValue) {
+        this.keyValue = keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the input key attribute (identifying the device or system) that caused the creation of this detector
+     * (instance).
+     * </p>
+     * 
+     * @return The value of the input key attribute (identifying the device or system) that caused the creation of this
+     *         detector (instance).
+     */
+
+    public String getKeyValue() {
+        return this.keyValue;
+    }
+
+    /**
+     * <p>
+     * The value of the input key attribute (identifying the device or system) that caused the creation of this detector
+     * (instance).
+     * </p>
+     * 
+     * @param keyValue
+     *        The value of the input key attribute (identifying the device or system) that caused the creation of this
+     *        detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorRequest withKeyValue(String keyValue) {
+        setKeyValue(keyValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new state, variable values, and timer settings of the detector (instance).
+     * </p>
+     * 
+     * @param state
+     *        The new state, variable values, and timer settings of the detector (instance).
+     */
+
+    public void setState(DetectorStateDefinition state) {
+        this.state = state;
+    }
+
+    /**
+     * <p>
+     * The new state, variable values, and timer settings of the detector (instance).
+     * </p>
+     * 
+     * @return The new state, variable values, and timer settings of the detector (instance).
+     */
+
+    public DetectorStateDefinition getState() {
+        return this.state;
+    }
+
+    /**
+     * <p>
+     * The new state, variable values, and timer settings of the detector (instance).
+     * </p>
+     * 
+     * @param state
+     *        The new state, variable values, and timer settings of the detector (instance).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateDetectorRequest withState(DetectorStateDefinition state) {
+        setState(state);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getMessageId() != null)
+            sb.append("MessageId: ").append(getMessageId()).append(",");
+        if (getDetectorModelName() != null)
+            sb.append("DetectorModelName: ").append(getDetectorModelName()).append(",");
+        if (getKeyValue() != null)
+            sb.append("KeyValue: ").append(getKeyValue()).append(",");
+        if (getState() != null)
+            sb.append("State: ").append(getState());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateDetectorRequest == false)
+            return false;
+        UpdateDetectorRequest other = (UpdateDetectorRequest) obj;
+        if (other.getMessageId() == null ^ this.getMessageId() == null)
+            return false;
+        if (other.getMessageId() != null && other.getMessageId().equals(this.getMessageId()) == false)
+            return false;
+        if (other.getDetectorModelName() == null ^ this.getDetectorModelName() == null)
+            return false;
+        if (other.getDetectorModelName() != null && other.getDetectorModelName().equals(this.getDetectorModelName()) == false)
+            return false;
+        if (other.getKeyValue() == null ^ this.getKeyValue() == null)
+            return false;
+        if (other.getKeyValue() != null && other.getKeyValue().equals(this.getKeyValue()) == false)
+            return false;
+        if (other.getState() == null ^ this.getState() == null)
+            return false;
+        if (other.getState() != null && other.getState().equals(this.getState()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getMessageId() == null) ? 0 : getMessageId().hashCode());
+        hashCode = prime * hashCode + ((getDetectorModelName() == null) ? 0 : getDetectorModelName().hashCode());
+        hashCode = prime * hashCode + ((getKeyValue() == null) ? 0 : getKeyValue().hashCode());
+        hashCode = prime * hashCode + ((getState() == null) ? 0 : getState().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateDetectorRequest clone() {
+        try {
+            return (UpdateDetectorRequest) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.UpdateDetectorRequestMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Variable.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Variable.java
new file mode 100644
index 000000000000..447ef37206d1
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/Variable.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The current state of the variable.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/Variable" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Variable implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     */
+    private String name;
+    /**
+     * <p>
+     * The current value of the variable.
+     * </p>
+     */
+    private String value;
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @param name
+     *        The name of the variable.
+     */
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @return The name of the variable.
+     */
+
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @param name
+     *        The name of the variable.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Variable withName(String name) {
+        setName(name);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The current value of the variable.
+     * </p>
+     * 
+     * @param value
+     *        The current value of the variable.
+     */
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * <p>
+     * The current value of the variable.
+     * </p>
+     * 
+     * @return The current value of the variable.
+     */
+
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * <p>
+     * The current value of the variable.
+     * </p>
+     * 
+     * @param value
+     *        The current value of the variable.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Variable withValue(String value) {
+        setValue(value);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getName() != null)
+            sb.append("Name: ").append(getName()).append(",");
+        if (getValue() != null)
+            sb.append("Value: ").append(getValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Variable == false)
+            return false;
+        Variable other = (Variable) obj;
+        if (other.getName() == null ^ this.getName() == null)
+            return false;
+        if (other.getName() != null && other.getName().equals(this.getName()) == false)
+            return false;
+        if (other.getValue() == null ^ this.getValue() == null)
+            return false;
+        if (other.getValue() != null && other.getValue().equals(this.getValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getValue() == null) ? 0 : getValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Variable clone() {
+        try {
+            return (Variable) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.VariableMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/VariableDefinition.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/VariableDefinition.java
new file mode 100644
index 000000000000..77e72fdc32d5
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/VariableDefinition.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The new value of the variable.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/iotevents-data-2018-10-23/VariableDefinition" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class VariableDefinition implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     */
+    private String name;
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     */
+    private String value;
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @param name
+     *        The name of the variable.
+     */
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @return The name of the variable.
+     */
+
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * <p>
+     * The name of the variable.
+     * </p>
+     * 
+     * @param name
+     *        The name of the variable.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public VariableDefinition withName(String name) {
+        setName(name);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     * 
+     * @param value
+     *        The new value of the variable.
+     */
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     * 
+     * @return The new value of the variable.
+     */
+
+    public String getValue() {
+        return this.value;
+    }
+
+    /**
+     * <p>
+     * The new value of the variable.
+     * </p>
+     * 
+     * @param value
+     *        The new value of the variable.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public VariableDefinition withValue(String value) {
+        setValue(value);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getName() != null)
+            sb.append("Name: ").append(getName()).append(",");
+        if (getValue() != null)
+            sb.append("Value: ").append(getValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof VariableDefinition == false)
+            return false;
+        VariableDefinition other = (VariableDefinition) obj;
+        if (other.getName() == null ^ this.getName() == null)
+            return false;
+        if (other.getName() != null && other.getName().equals(this.getName()) == false)
+            return false;
+        if (other.getValue() == null ^ this.getValue() == null)
+            return false;
+        if (other.getValue() != null && other.getValue().equals(this.getValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getValue() == null) ? 0 : getValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public VariableDefinition clone() {
+        try {
+            return (VariableDefinition) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.ioteventsdata.model.transform.VariableDefinitionMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageErrorEntryJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageErrorEntryJsonUnmarshaller.java
new file mode 100644
index 000000000000..4beea55812ba
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageErrorEntryJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BatchPutMessageErrorEntry JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchPutMessageErrorEntryJsonUnmarshaller implements Unmarshaller<BatchPutMessageErrorEntry, JsonUnmarshallerContext> {
+
+    public BatchPutMessageErrorEntry unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BatchPutMessageErrorEntry batchPutMessageErrorEntry = new BatchPutMessageErrorEntry();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("messageId", targetDepth)) {
+                    context.nextToken();
+                    batchPutMessageErrorEntry.setMessageId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("errorCode", targetDepth)) {
+                    context.nextToken();
+                    batchPutMessageErrorEntry.setErrorCode(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("errorMessage", targetDepth)) {
+                    context.nextToken();
+                    batchPutMessageErrorEntry.setErrorMessage(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return batchPutMessageErrorEntry;
+    }
+
+    private static BatchPutMessageErrorEntryJsonUnmarshaller instance;
+
+    public static BatchPutMessageErrorEntryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BatchPutMessageErrorEntryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageErrorEntryMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageErrorEntryMarshaller.java
new file mode 100644
index 000000000000..c027ce6c38a6
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageErrorEntryMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchPutMessageErrorEntryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchPutMessageErrorEntryMarshaller {
+
+    private static final MarshallingInfo<String> MESSAGEID_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("messageId").build();
+    private static final MarshallingInfo<String> ERRORCODE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("errorCode").build();
+    private static final MarshallingInfo<String> ERRORMESSAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("errorMessage").build();
+
+    private static final BatchPutMessageErrorEntryMarshaller instance = new BatchPutMessageErrorEntryMarshaller();
+
+    public static BatchPutMessageErrorEntryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BatchPutMessageErrorEntry batchPutMessageErrorEntry, ProtocolMarshaller protocolMarshaller) {
+
+        if (batchPutMessageErrorEntry == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(batchPutMessageErrorEntry.getMessageId(), MESSAGEID_BINDING);
+            protocolMarshaller.marshall(batchPutMessageErrorEntry.getErrorCode(), ERRORCODE_BINDING);
+            protocolMarshaller.marshall(batchPutMessageErrorEntry.getErrorMessage(), ERRORMESSAGE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageRequestMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageRequestMarshaller.java
new file mode 100644
index 000000000000..656ff7065b24
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageRequestMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchPutMessageRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchPutMessageRequestMarshaller {
+
+    private static final MarshallingInfo<List> MESSAGES_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("messages").build();
+
+    private static final BatchPutMessageRequestMarshaller instance = new BatchPutMessageRequestMarshaller();
+
+    public static BatchPutMessageRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BatchPutMessageRequest batchPutMessageRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (batchPutMessageRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(batchPutMessageRequest.getMessages(), MESSAGES_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageRequestProtocolMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..a7dcdb163776
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchPutMessageRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchPutMessageRequestProtocolMarshaller implements Marshaller<Request<BatchPutMessageRequest>, BatchPutMessageRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/inputs/messages")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEventsData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public BatchPutMessageRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<BatchPutMessageRequest> marshall(BatchPutMessageRequest batchPutMessageRequest) {
+
+        if (batchPutMessageRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<BatchPutMessageRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    batchPutMessageRequest);
+
+            protocolMarshaller.startMarshalling();
+            BatchPutMessageRequestMarshaller.getInstance().marshall(batchPutMessageRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageResultJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..4addf9b2f3bd
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchPutMessageResultJsonUnmarshaller.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BatchPutMessageResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchPutMessageResultJsonUnmarshaller implements Unmarshaller<BatchPutMessageResult, JsonUnmarshallerContext> {
+
+    public BatchPutMessageResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BatchPutMessageResult batchPutMessageResult = new BatchPutMessageResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return batchPutMessageResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("BatchPutMessageErrorEntries", targetDepth)) {
+                    context.nextToken();
+                    batchPutMessageResult.setBatchPutMessageErrorEntries(new ListUnmarshaller<BatchPutMessageErrorEntry>(
+                            BatchPutMessageErrorEntryJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return batchPutMessageResult;
+    }
+
+    private static BatchPutMessageResultJsonUnmarshaller instance;
+
+    public static BatchPutMessageResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BatchPutMessageResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorErrorEntryJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorErrorEntryJsonUnmarshaller.java
new file mode 100644
index 000000000000..a45173109c3b
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorErrorEntryJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BatchUpdateDetectorErrorEntry JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchUpdateDetectorErrorEntryJsonUnmarshaller implements Unmarshaller<BatchUpdateDetectorErrorEntry, JsonUnmarshallerContext> {
+
+    public BatchUpdateDetectorErrorEntry unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BatchUpdateDetectorErrorEntry batchUpdateDetectorErrorEntry = new BatchUpdateDetectorErrorEntry();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("messageId", targetDepth)) {
+                    context.nextToken();
+                    batchUpdateDetectorErrorEntry.setMessageId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("errorCode", targetDepth)) {
+                    context.nextToken();
+                    batchUpdateDetectorErrorEntry.setErrorCode(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("errorMessage", targetDepth)) {
+                    context.nextToken();
+                    batchUpdateDetectorErrorEntry.setErrorMessage(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return batchUpdateDetectorErrorEntry;
+    }
+
+    private static BatchUpdateDetectorErrorEntryJsonUnmarshaller instance;
+
+    public static BatchUpdateDetectorErrorEntryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BatchUpdateDetectorErrorEntryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorErrorEntryMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorErrorEntryMarshaller.java
new file mode 100644
index 000000000000..631ee8794875
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorErrorEntryMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchUpdateDetectorErrorEntryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchUpdateDetectorErrorEntryMarshaller {
+
+    private static final MarshallingInfo<String> MESSAGEID_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("messageId").build();
+    private static final MarshallingInfo<String> ERRORCODE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("errorCode").build();
+    private static final MarshallingInfo<String> ERRORMESSAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("errorMessage").build();
+
+    private static final BatchUpdateDetectorErrorEntryMarshaller instance = new BatchUpdateDetectorErrorEntryMarshaller();
+
+    public static BatchUpdateDetectorErrorEntryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BatchUpdateDetectorErrorEntry batchUpdateDetectorErrorEntry, ProtocolMarshaller protocolMarshaller) {
+
+        if (batchUpdateDetectorErrorEntry == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(batchUpdateDetectorErrorEntry.getMessageId(), MESSAGEID_BINDING);
+            protocolMarshaller.marshall(batchUpdateDetectorErrorEntry.getErrorCode(), ERRORCODE_BINDING);
+            protocolMarshaller.marshall(batchUpdateDetectorErrorEntry.getErrorMessage(), ERRORMESSAGE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorRequestMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorRequestMarshaller.java
new file mode 100644
index 000000000000..a058fbc56496
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorRequestMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchUpdateDetectorRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchUpdateDetectorRequestMarshaller {
+
+    private static final MarshallingInfo<List> DETECTORS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("detectors").build();
+
+    private static final BatchUpdateDetectorRequestMarshaller instance = new BatchUpdateDetectorRequestMarshaller();
+
+    public static BatchUpdateDetectorRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BatchUpdateDetectorRequest batchUpdateDetectorRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (batchUpdateDetectorRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(batchUpdateDetectorRequest.getDetectors(), DETECTORS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorRequestProtocolMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..bb9493d2d030
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchUpdateDetectorRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchUpdateDetectorRequestProtocolMarshaller implements Marshaller<Request<BatchUpdateDetectorRequest>, BatchUpdateDetectorRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/detectors")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSIoTEventsData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public BatchUpdateDetectorRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<BatchUpdateDetectorRequest> marshall(BatchUpdateDetectorRequest batchUpdateDetectorRequest) {
+
+        if (batchUpdateDetectorRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<BatchUpdateDetectorRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    batchUpdateDetectorRequest);
+
+            protocolMarshaller.startMarshalling();
+            BatchUpdateDetectorRequestMarshaller.getInstance().marshall(batchUpdateDetectorRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorResultJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..e383ccebde34
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/BatchUpdateDetectorResultJsonUnmarshaller.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BatchUpdateDetectorResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchUpdateDetectorResultJsonUnmarshaller implements Unmarshaller<BatchUpdateDetectorResult, JsonUnmarshallerContext> {
+
+    public BatchUpdateDetectorResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BatchUpdateDetectorResult batchUpdateDetectorResult = new BatchUpdateDetectorResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return batchUpdateDetectorResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("batchUpdateDetectorErrorEntries", targetDepth)) {
+                    context.nextToken();
+                    batchUpdateDetectorResult.setBatchUpdateDetectorErrorEntries(new ListUnmarshaller<BatchUpdateDetectorErrorEntry>(
+                            BatchUpdateDetectorErrorEntryJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return batchUpdateDetectorResult;
+    }
+
+    private static BatchUpdateDetectorResultJsonUnmarshaller instance;
+
+    public static BatchUpdateDetectorResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BatchUpdateDetectorResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorRequestMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorRequestMarshaller.java
new file mode 100644
index 000000000000..ab96a910f3fa
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorRequestMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeDetectorRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeDetectorRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> KEYVALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("keyValue").build();
+
+    private static final DescribeDetectorRequestMarshaller instance = new DescribeDetectorRequestMarshaller();
+
+    public static DescribeDetectorRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DescribeDetectorRequest describeDetectorRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (describeDetectorRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(describeDetectorRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(describeDetectorRequest.getKeyValue(), KEYVALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorRequestProtocolMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..2f1a4f060c7b
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeDetectorRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeDetectorRequestProtocolMarshaller implements Marshaller<Request<DescribeDetectorRequest>, DescribeDetectorRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/detectors/{detectorModelName}/keyValues/").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false)
+            .hasPayloadMembers(false).serviceName("AWSIoTEventsData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DescribeDetectorRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DescribeDetectorRequest> marshall(DescribeDetectorRequest describeDetectorRequest) {
+
+        if (describeDetectorRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DescribeDetectorRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    describeDetectorRequest);
+
+            protocolMarshaller.startMarshalling();
+            DescribeDetectorRequestMarshaller.getInstance().marshall(describeDetectorRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorResultJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..0e14deff83e8
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DescribeDetectorResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DescribeDetectorResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeDetectorResultJsonUnmarshaller implements Unmarshaller<DescribeDetectorResult, JsonUnmarshallerContext> {
+
+    public DescribeDetectorResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DescribeDetectorResult describeDetectorResult = new DescribeDetectorResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return describeDetectorResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detector", targetDepth)) {
+                    context.nextToken();
+                    describeDetectorResult.setDetector(DetectorJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return describeDetectorResult;
+    }
+
+    private static DescribeDetectorResultJsonUnmarshaller instance;
+
+    public static DescribeDetectorResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DescribeDetectorResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorJsonUnmarshaller.java
new file mode 100644
index 000000000000..f58736bfb7e2
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorJsonUnmarshaller.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Detector JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorJsonUnmarshaller implements Unmarshaller<Detector, JsonUnmarshallerContext> {
+
+    public Detector unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Detector detector = new Detector();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    detector.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyValue", targetDepth)) {
+                    context.nextToken();
+                    detector.setKeyValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelVersion", targetDepth)) {
+                    context.nextToken();
+                    detector.setDetectorModelVersion(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("state", targetDepth)) {
+                    context.nextToken();
+                    detector.setState(DetectorStateJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    detector.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("lastUpdateTime", targetDepth)) {
+                    context.nextToken();
+                    detector.setLastUpdateTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detector;
+    }
+
+    private static DetectorJsonUnmarshaller instance;
+
+    public static DetectorJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorMarshaller.java
new file mode 100644
index 000000000000..4694b5f203d1
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorMarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> KEYVALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyValue").build();
+    private static final MarshallingInfo<String> DETECTORMODELVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelVersion").build();
+    private static final MarshallingInfo<StructuredPojo> STATE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("state").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<java.util.Date> LASTUPDATETIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("lastUpdateTime").timestampFormat("unixTimestamp").build();
+
+    private static final DetectorMarshaller instance = new DetectorMarshaller();
+
+    public static DetectorMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Detector detector, ProtocolMarshaller protocolMarshaller) {
+
+        if (detector == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detector.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(detector.getKeyValue(), KEYVALUE_BINDING);
+            protocolMarshaller.marshall(detector.getDetectorModelVersion(), DETECTORMODELVERSION_BINDING);
+            protocolMarshaller.marshall(detector.getState(), STATE_BINDING);
+            protocolMarshaller.marshall(detector.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(detector.getLastUpdateTime(), LASTUPDATETIME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateDefinitionJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateDefinitionJsonUnmarshaller.java
new file mode 100644
index 000000000000..4c54c537124c
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateDefinitionJsonUnmarshaller.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorStateDefinition JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorStateDefinitionJsonUnmarshaller implements Unmarshaller<DetectorStateDefinition, JsonUnmarshallerContext> {
+
+    public DetectorStateDefinition unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorStateDefinition detectorStateDefinition = new DetectorStateDefinition();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("stateName", targetDepth)) {
+                    context.nextToken();
+                    detectorStateDefinition.setStateName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("variables", targetDepth)) {
+                    context.nextToken();
+                    detectorStateDefinition.setVariables(new ListUnmarshaller<VariableDefinition>(VariableDefinitionJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+                if (context.testExpression("timers", targetDepth)) {
+                    context.nextToken();
+                    detectorStateDefinition.setTimers(new ListUnmarshaller<TimerDefinition>(TimerDefinitionJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorStateDefinition;
+    }
+
+    private static DetectorStateDefinitionJsonUnmarshaller instance;
+
+    public static DetectorStateDefinitionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorStateDefinitionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateDefinitionMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateDefinitionMarshaller.java
new file mode 100644
index 000000000000..3f007c804bc1
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateDefinitionMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorStateDefinitionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorStateDefinitionMarshaller {
+
+    private static final MarshallingInfo<String> STATENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("stateName").build();
+    private static final MarshallingInfo<List> VARIABLES_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("variables").build();
+    private static final MarshallingInfo<List> TIMERS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("timers").build();
+
+    private static final DetectorStateDefinitionMarshaller instance = new DetectorStateDefinitionMarshaller();
+
+    public static DetectorStateDefinitionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorStateDefinition detectorStateDefinition, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorStateDefinition == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorStateDefinition.getStateName(), STATENAME_BINDING);
+            protocolMarshaller.marshall(detectorStateDefinition.getVariables(), VARIABLES_BINDING);
+            protocolMarshaller.marshall(detectorStateDefinition.getTimers(), TIMERS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateJsonUnmarshaller.java
new file mode 100644
index 000000000000..6b55b1d47b45
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorState JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorStateJsonUnmarshaller implements Unmarshaller<DetectorState, JsonUnmarshallerContext> {
+
+    public DetectorState unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorState detectorState = new DetectorState();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("stateName", targetDepth)) {
+                    context.nextToken();
+                    detectorState.setStateName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("variables", targetDepth)) {
+                    context.nextToken();
+                    detectorState.setVariables(new ListUnmarshaller<Variable>(VariableJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("timers", targetDepth)) {
+                    context.nextToken();
+                    detectorState.setTimers(new ListUnmarshaller<Timer>(TimerJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorState;
+    }
+
+    private static DetectorStateJsonUnmarshaller instance;
+
+    public static DetectorStateJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorStateJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateMarshaller.java
new file mode 100644
index 000000000000..a565c7421d4b
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorStateMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorStateMarshaller {
+
+    private static final MarshallingInfo<String> STATENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("stateName").build();
+    private static final MarshallingInfo<List> VARIABLES_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("variables").build();
+    private static final MarshallingInfo<List> TIMERS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("timers").build();
+
+    private static final DetectorStateMarshaller instance = new DetectorStateMarshaller();
+
+    public static DetectorStateMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorState detectorState, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorState == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorState.getStateName(), STATENAME_BINDING);
+            protocolMarshaller.marshall(detectorState.getVariables(), VARIABLES_BINDING);
+            protocolMarshaller.marshall(detectorState.getTimers(), TIMERS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateSummaryJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..b1595131c6b2
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateSummaryJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorStateSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorStateSummaryJsonUnmarshaller implements Unmarshaller<DetectorStateSummary, JsonUnmarshallerContext> {
+
+    public DetectorStateSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorStateSummary detectorStateSummary = new DetectorStateSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("stateName", targetDepth)) {
+                    context.nextToken();
+                    detectorStateSummary.setStateName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorStateSummary;
+    }
+
+    private static DetectorStateSummaryJsonUnmarshaller instance;
+
+    public static DetectorStateSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorStateSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateSummaryMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateSummaryMarshaller.java
new file mode 100644
index 000000000000..b75f8a556fdd
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorStateSummaryMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorStateSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorStateSummaryMarshaller {
+
+    private static final MarshallingInfo<String> STATENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("stateName").build();
+
+    private static final DetectorStateSummaryMarshaller instance = new DetectorStateSummaryMarshaller();
+
+    public static DetectorStateSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorStateSummary detectorStateSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorStateSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorStateSummary.getStateName(), STATENAME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorSummaryJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorSummaryJsonUnmarshaller.java
new file mode 100644
index 000000000000..9b63416384d4
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorSummaryJsonUnmarshaller.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DetectorSummary JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DetectorSummaryJsonUnmarshaller implements Unmarshaller<DetectorSummary, JsonUnmarshallerContext> {
+
+    public DetectorSummary unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DetectorSummary detectorSummary = new DetectorSummary();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    detectorSummary.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyValue", targetDepth)) {
+                    context.nextToken();
+                    detectorSummary.setKeyValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelVersion", targetDepth)) {
+                    context.nextToken();
+                    detectorSummary.setDetectorModelVersion(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("state", targetDepth)) {
+                    context.nextToken();
+                    detectorSummary.setState(DetectorStateSummaryJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    detectorSummary.setCreationTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+                if (context.testExpression("lastUpdateTime", targetDepth)) {
+                    context.nextToken();
+                    detectorSummary.setLastUpdateTime(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return detectorSummary;
+    }
+
+    private static DetectorSummaryJsonUnmarshaller instance;
+
+    public static DetectorSummaryJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DetectorSummaryJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorSummaryMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorSummaryMarshaller.java
new file mode 100644
index 000000000000..81ae65ae732d
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/DetectorSummaryMarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DetectorSummaryMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DetectorSummaryMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> KEYVALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyValue").build();
+    private static final MarshallingInfo<String> DETECTORMODELVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelVersion").build();
+    private static final MarshallingInfo<StructuredPojo> STATE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("state").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("unixTimestamp").build();
+    private static final MarshallingInfo<java.util.Date> LASTUPDATETIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("lastUpdateTime").timestampFormat("unixTimestamp").build();
+
+    private static final DetectorSummaryMarshaller instance = new DetectorSummaryMarshaller();
+
+    public static DetectorSummaryMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DetectorSummary detectorSummary, ProtocolMarshaller protocolMarshaller) {
+
+        if (detectorSummary == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(detectorSummary.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(detectorSummary.getKeyValue(), KEYVALUE_BINDING);
+            protocolMarshaller.marshall(detectorSummary.getDetectorModelVersion(), DETECTORMODELVERSION_BINDING);
+            protocolMarshaller.marshall(detectorSummary.getState(), STATE_BINDING);
+            protocolMarshaller.marshall(detectorSummary.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(detectorSummary.getLastUpdateTime(), LASTUPDATETIME_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsRequestMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsRequestMarshaller.java
new file mode 100644
index 000000000000..c5f180946ece
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsRequestMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListDetectorsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListDetectorsRequestMarshaller {
+
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> STATENAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("stateName").build();
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
+
+    private static final ListDetectorsRequestMarshaller instance = new ListDetectorsRequestMarshaller();
+
+    public static ListDetectorsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListDetectorsRequest listDetectorsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listDetectorsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listDetectorsRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(listDetectorsRequest.getStateName(), STATENAME_BINDING);
+            protocolMarshaller.marshall(listDetectorsRequest.getNextToken(), NEXTTOKEN_BINDING);
+            protocolMarshaller.marshall(listDetectorsRequest.getMaxResults(), MAXRESULTS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsRequestProtocolMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..f58535d1ecd9
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListDetectorsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListDetectorsRequestProtocolMarshaller implements Marshaller<Request<ListDetectorsRequest>, ListDetectorsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/detectors/{detectorModelName}").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false)
+            .serviceName("AWSIoTEventsData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListDetectorsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListDetectorsRequest> marshall(ListDetectorsRequest listDetectorsRequest) {
+
+        if (listDetectorsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListDetectorsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    listDetectorsRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListDetectorsRequestMarshaller.getInstance().marshall(listDetectorsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsResultJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..a3ac25f1ec79
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/ListDetectorsResultJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListDetectorsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListDetectorsResultJsonUnmarshaller implements Unmarshaller<ListDetectorsResult, JsonUnmarshallerContext> {
+
+    public ListDetectorsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListDetectorsResult listDetectorsResult = new ListDetectorsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listDetectorsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("detectorSummaries", targetDepth)) {
+                    context.nextToken();
+                    listDetectorsResult.setDetectorSummaries(new ListUnmarshaller<DetectorSummary>(DetectorSummaryJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listDetectorsResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listDetectorsResult;
+    }
+
+    private static ListDetectorsResultJsonUnmarshaller instance;
+
+    public static ListDetectorsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListDetectorsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/MessageJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/MessageJsonUnmarshaller.java
new file mode 100644
index 000000000000..f59a125a7c19
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/MessageJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+import java.nio.ByteBuffer;
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Message JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class MessageJsonUnmarshaller implements Unmarshaller<Message, JsonUnmarshallerContext> {
+
+    public Message unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Message message = new Message();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("messageId", targetDepth)) {
+                    context.nextToken();
+                    message.setMessageId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("inputName", targetDepth)) {
+                    context.nextToken();
+                    message.setInputName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("payload", targetDepth)) {
+                    context.nextToken();
+                    message.setPayload(context.getUnmarshaller(java.nio.ByteBuffer.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return message;
+    }
+
+    private static MessageJsonUnmarshaller instance;
+
+    public static MessageJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new MessageJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/MessageMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/MessageMarshaller.java
new file mode 100644
index 000000000000..66956bf37eaa
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/MessageMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * MessageMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class MessageMarshaller {
+
+    private static final MarshallingInfo<String> MESSAGEID_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("messageId").build();
+    private static final MarshallingInfo<String> INPUTNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("inputName").build();
+    private static final MarshallingInfo<java.nio.ByteBuffer> PAYLOAD_BINDING = MarshallingInfo.builder(MarshallingType.BYTE_BUFFER)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("payload").build();
+
+    private static final MessageMarshaller instance = new MessageMarshaller();
+
+    public static MessageMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Message message, ProtocolMarshaller protocolMarshaller) {
+
+        if (message == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(message.getMessageId(), MESSAGEID_BINDING);
+            protocolMarshaller.marshall(message.getInputName(), INPUTNAME_BINDING);
+            protocolMarshaller.marshall(message.getPayload(), PAYLOAD_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerDefinitionJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerDefinitionJsonUnmarshaller.java
new file mode 100644
index 000000000000..bbea03933156
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerDefinitionJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * TimerDefinition JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TimerDefinitionJsonUnmarshaller implements Unmarshaller<TimerDefinition, JsonUnmarshallerContext> {
+
+    public TimerDefinition unmarshall(JsonUnmarshallerContext context) throws Exception {
+        TimerDefinition timerDefinition = new TimerDefinition();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("name", targetDepth)) {
+                    context.nextToken();
+                    timerDefinition.setName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("seconds", targetDepth)) {
+                    context.nextToken();
+                    timerDefinition.setSeconds(context.getUnmarshaller(Integer.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return timerDefinition;
+    }
+
+    private static TimerDefinitionJsonUnmarshaller instance;
+
+    public static TimerDefinitionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TimerDefinitionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerDefinitionMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerDefinitionMarshaller.java
new file mode 100644
index 000000000000..4d3875843019
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerDefinitionMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TimerDefinitionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TimerDefinitionMarshaller {
+
+    private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("name").build();
+    private static final MarshallingInfo<Integer> SECONDS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("seconds").build();
+
+    private static final TimerDefinitionMarshaller instance = new TimerDefinitionMarshaller();
+
+    public static TimerDefinitionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(TimerDefinition timerDefinition, ProtocolMarshaller protocolMarshaller) {
+
+        if (timerDefinition == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(timerDefinition.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(timerDefinition.getSeconds(), SECONDS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerJsonUnmarshaller.java
new file mode 100644
index 000000000000..eaeec37fce5b
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Timer JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TimerJsonUnmarshaller implements Unmarshaller<Timer, JsonUnmarshallerContext> {
+
+    public Timer unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Timer timer = new Timer();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("name", targetDepth)) {
+                    context.nextToken();
+                    timer.setName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("timestamp", targetDepth)) {
+                    context.nextToken();
+                    timer.setTimestamp(DateJsonUnmarshallerFactory.getInstance("unixTimestamp").unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return timer;
+    }
+
+    private static TimerJsonUnmarshaller instance;
+
+    public static TimerJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TimerJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerMarshaller.java
new file mode 100644
index 000000000000..aef56c914440
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/TimerMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TimerMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TimerMarshaller {
+
+    private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("name").build();
+    private static final MarshallingInfo<java.util.Date> TIMESTAMP_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("timestamp").timestampFormat("unixTimestamp").build();
+
+    private static final TimerMarshaller instance = new TimerMarshaller();
+
+    public static TimerMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Timer timer, ProtocolMarshaller protocolMarshaller) {
+
+        if (timer == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(timer.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(timer.getTimestamp(), TIMESTAMP_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/UpdateDetectorRequestJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/UpdateDetectorRequestJsonUnmarshaller.java
new file mode 100644
index 000000000000..e9f410f5288d
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/UpdateDetectorRequestJsonUnmarshaller.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UpdateDetectorRequest JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateDetectorRequestJsonUnmarshaller implements Unmarshaller<UpdateDetectorRequest, JsonUnmarshallerContext> {
+
+    public UpdateDetectorRequest unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UpdateDetectorRequest updateDetectorRequest = new UpdateDetectorRequest();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("messageId", targetDepth)) {
+                    context.nextToken();
+                    updateDetectorRequest.setMessageId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("detectorModelName", targetDepth)) {
+                    context.nextToken();
+                    updateDetectorRequest.setDetectorModelName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("keyValue", targetDepth)) {
+                    context.nextToken();
+                    updateDetectorRequest.setKeyValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("state", targetDepth)) {
+                    context.nextToken();
+                    updateDetectorRequest.setState(DetectorStateDefinitionJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return updateDetectorRequest;
+    }
+
+    private static UpdateDetectorRequestJsonUnmarshaller instance;
+
+    public static UpdateDetectorRequestJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UpdateDetectorRequestJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/UpdateDetectorRequestMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/UpdateDetectorRequestMarshaller.java
new file mode 100644
index 000000000000..12f568150499
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/UpdateDetectorRequestMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateDetectorRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateDetectorRequestMarshaller {
+
+    private static final MarshallingInfo<String> MESSAGEID_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("messageId").build();
+    private static final MarshallingInfo<String> DETECTORMODELNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("detectorModelName").build();
+    private static final MarshallingInfo<String> KEYVALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("keyValue").build();
+    private static final MarshallingInfo<StructuredPojo> STATE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("state").build();
+
+    private static final UpdateDetectorRequestMarshaller instance = new UpdateDetectorRequestMarshaller();
+
+    public static UpdateDetectorRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UpdateDetectorRequest updateDetectorRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (updateDetectorRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(updateDetectorRequest.getMessageId(), MESSAGEID_BINDING);
+            protocolMarshaller.marshall(updateDetectorRequest.getDetectorModelName(), DETECTORMODELNAME_BINDING);
+            protocolMarshaller.marshall(updateDetectorRequest.getKeyValue(), KEYVALUE_BINDING);
+            protocolMarshaller.marshall(updateDetectorRequest.getState(), STATE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableDefinitionJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableDefinitionJsonUnmarshaller.java
new file mode 100644
index 000000000000..4cec10c775c2
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableDefinitionJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * VariableDefinition JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class VariableDefinitionJsonUnmarshaller implements Unmarshaller<VariableDefinition, JsonUnmarshallerContext> {
+
+    public VariableDefinition unmarshall(JsonUnmarshallerContext context) throws Exception {
+        VariableDefinition variableDefinition = new VariableDefinition();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("name", targetDepth)) {
+                    context.nextToken();
+                    variableDefinition.setName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("value", targetDepth)) {
+                    context.nextToken();
+                    variableDefinition.setValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return variableDefinition;
+    }
+
+    private static VariableDefinitionJsonUnmarshaller instance;
+
+    public static VariableDefinitionJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new VariableDefinitionJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableDefinitionMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableDefinitionMarshaller.java
new file mode 100644
index 000000000000..fb8c262b7317
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableDefinitionMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * VariableDefinitionMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class VariableDefinitionMarshaller {
+
+    private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("name").build();
+    private static final MarshallingInfo<String> VALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("value").build();
+
+    private static final VariableDefinitionMarshaller instance = new VariableDefinitionMarshaller();
+
+    public static VariableDefinitionMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(VariableDefinition variableDefinition, ProtocolMarshaller protocolMarshaller) {
+
+        if (variableDefinition == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(variableDefinition.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(variableDefinition.getValue(), VALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableJsonUnmarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableJsonUnmarshaller.java
new file mode 100644
index 000000000000..473b356b77f4
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.ioteventsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Variable JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class VariableJsonUnmarshaller implements Unmarshaller<Variable, JsonUnmarshallerContext> {
+
+    public Variable unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Variable variable = new Variable();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("name", targetDepth)) {
+                    context.nextToken();
+                    variable.setName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("value", targetDepth)) {
+                    context.nextToken();
+                    variable.setValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return variable;
+    }
+
+    private static VariableJsonUnmarshaller instance;
+
+    public static VariableJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new VariableJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableMarshaller.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableMarshaller.java
new file mode 100644
index 000000000000..937db81eed3c
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/model/transform/VariableMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.ioteventsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.ioteventsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * VariableMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class VariableMarshaller {
+
+    private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("name").build();
+    private static final MarshallingInfo<String> VALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("value").build();
+
+    private static final VariableMarshaller instance = new VariableMarshaller();
+
+    public static VariableMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Variable variable, ProtocolMarshaller protocolMarshaller) {
+
+        if (variable == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(variable.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(variable.getValue(), VALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/package-info.java b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/package-info.java
new file mode 100644
index 000000000000..243fba718233
--- /dev/null
+++ b/aws-java-sdk-ioteventsdata/src/main/java/com/amazonaws/services/ioteventsdata/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014-2019 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.
+ */
+
+/**
+ * <p>
+ * AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions
+ * when such events occur.
+ * </p>
+ */
+package com.amazonaws.services.ioteventsdata;
+
diff --git a/aws-java-sdk-iotjobsdataplane/pom.xml b/aws-java-sdk-iotjobsdataplane/pom.xml
index 763158ea2fe3..73b6327242e3 100644
--- a/aws-java-sdk-iotjobsdataplane/pom.xml
+++ b/aws-java-sdk-iotjobsdataplane/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iotjobsdataplane</artifactId>
diff --git a/aws-java-sdk-iotthingsgraph/pom.xml b/aws-java-sdk-iotthingsgraph/pom.xml
index 4cbee0ce0a64..d759f6e48b8d 100644
--- a/aws-java-sdk-iotthingsgraph/pom.xml
+++ b/aws-java-sdk-iotthingsgraph/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-iotthingsgraph</artifactId>
diff --git a/aws-java-sdk-kafka/pom.xml b/aws-java-sdk-kafka/pom.xml
index cb9b6180c6a0..21950c8c935a 100644
--- a/aws-java-sdk-kafka/pom.xml
+++ b/aws-java-sdk-kafka/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-kafka</artifactId>
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafka.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafka.java
index 5b5cacbd819c..202be292abae 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafka.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafka.java
@@ -26,6 +26,7 @@
  * {@link com.amazonaws.services.kafka.AbstractAWSKafka} instead.
  * </p>
  * <p>
+ * 
  * <p>
  * The operations for managing an Amazon MSK cluster.
  * </p>
@@ -49,19 +50,33 @@ public interface AWSKafka {
      * @param createClusterRequest
      * @return Result of the CreateCluster operation returned by the service.
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @throws TooManyRequestsException
+     *         <p>
      *         429 response
+     *         </p>
      * @throws ConflictException
+     *         <p>
      *         This cluster name already exists. Retry your request using another name.
+     *         </p>
      * @sample AWSKafka.CreateCluster
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/CreateCluster" target="_top">AWS API
      *      Documentation</a>
@@ -76,19 +91,33 @@ public interface AWSKafka {
      * @param createConfigurationRequest
      * @return Result of the CreateConfiguration operation returned by the service.
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @throws TooManyRequestsException
+     *         <p>
      *         429 response
+     *         </p>
      * @throws ConflictException
-     *         This configuration name already exists. Retry your request using another name.
+     *         <p>
+     *         This cluster name already exists. Retry your request using another name.
+     *         </p>
      * @sample AWSKafka.CreateConfiguration
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/CreateConfiguration" target="_top">AWS API
      *      Documentation</a>
@@ -103,13 +132,21 @@ public interface AWSKafka {
      * @param deleteClusterRequest
      * @return Result of the DeleteCluster operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.DeleteCluster
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DeleteCluster" target="_top">AWS API
      *      Documentation</a>
@@ -124,21 +161,64 @@ public interface AWSKafka {
      * @param describeClusterRequest
      * @return Result of the DescribeCluster operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.DescribeCluster
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeCluster" target="_top">AWS API
      *      Documentation</a>
      */
     DescribeClusterResult describeCluster(DescribeClusterRequest describeClusterRequest);
 
+    /**
+     * <p>
+     * Returns a description of the cluster operation specified by the ARN.
+     * </p>
+     * 
+     * @param describeClusterOperationRequest
+     * @return Result of the DescribeClusterOperation operation returned by the service.
+     * @throws NotFoundException
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @sample AWSKafka.DescribeClusterOperation
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterOperation" target="_top">AWS
+     *      API Documentation</a>
+     */
+    DescribeClusterOperationResult describeClusterOperation(DescribeClusterOperationRequest describeClusterOperationRequest);
+
     /**
      * <p>
      * Returns a description of this MSK configuration.
@@ -147,17 +227,29 @@ public interface AWSKafka {
      * @param describeConfigurationRequest
      * @return Result of the DescribeConfiguration operation returned by the service.
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws NotFoundException
+     *         <p>
      *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @sample AWSKafka.DescribeConfiguration
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeConfiguration" target="_top">AWS
      *      API Documentation</a>
@@ -172,17 +264,29 @@ public interface AWSKafka {
      * @param describeConfigurationRevisionRequest
      * @return Result of the DescribeConfigurationRevision operation returned by the service.
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws NotFoundException
+     *         <p>
      *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @sample AWSKafka.DescribeConfigurationRevision
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeConfigurationRevision"
      *      target="_top">AWS API Documentation</a>
@@ -197,15 +301,25 @@ public interface AWSKafka {
      * @param getBootstrapBrokersRequest
      * @return Result of the GetBootstrapBrokers operation returned by the service.
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ConflictException
+     *         <p>
      *         This cluster name already exists. Retry your request using another name.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.GetBootstrapBrokers
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/GetBootstrapBrokers" target="_top">AWS API
      *      Documentation</a>
@@ -214,19 +328,56 @@ public interface AWSKafka {
 
     /**
      * <p>
-     * Returns a list of clusters in an account.
+     * Returns a list of all the operations that have been performed on the specified MSK cluster.
+     * </p>
+     * 
+     * @param listClusterOperationsRequest
+     * @return Result of the ListClusterOperations operation returned by the service.
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @sample AWSKafka.ListClusterOperations
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusterOperations" target="_top">AWS
+     *      API Documentation</a>
+     */
+    ListClusterOperationsResult listClusterOperations(ListClusterOperationsRequest listClusterOperationsRequest);
+
+    /**
+     * <p>
+     * Returns a list of all the MSK clusters in the current Region.
      * </p>
      * 
      * @param listClustersRequest
      * @return Result of the ListClusters operation returned by the service.
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.ListClusters
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusters" target="_top">AWS API
      *      Documentation</a>
@@ -235,21 +386,68 @@ public interface AWSKafka {
 
     /**
      * <p>
-     * Returns a list of all the MSK configurations in this Region for this account.
+     * Returns a list of all the MSK configurations in this Region.
+     * </p>
+     * 
+     * @param listConfigurationRevisionsRequest
+     * @return Result of the ListConfigurationRevisions operation returned by the service.
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @throws NotFoundException
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
+     * @throws ServiceUnavailableException
+     *         <p>
+     *         503 response
+     *         </p>
+     * @sample AWSKafka.ListConfigurationRevisions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurationRevisions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    ListConfigurationRevisionsResult listConfigurationRevisions(ListConfigurationRevisionsRequest listConfigurationRevisionsRequest);
+
+    /**
+     * <p>
+     * Returns a list of all the MSK configurations in this Region.
      * </p>
      * 
      * @param listConfigurationsRequest
      * @return Result of the ListConfigurations operation returned by the service.
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.ListConfigurations
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurations" target="_top">AWS API
      *      Documentation</a>
@@ -264,13 +462,21 @@ public interface AWSKafka {
      * @param listNodesRequest
      * @return Result of the ListNodes operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.ListNodes
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListNodes" target="_top">AWS API
      *      Documentation</a>
@@ -279,17 +485,23 @@ public interface AWSKafka {
 
     /**
      * <p>
-     * Returns a list of tags attached to a resource.
+     * Returns a list of the tags associated with the specified resource.
      * </p>
      * 
      * @param listTagsForResourceRequest
      * @return Result of the ListTagsForResource operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @sample AWSKafka.ListTagsForResource
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListTagsForResource" target="_top">AWS API
      *      Documentation</a>
@@ -298,17 +510,23 @@ public interface AWSKafka {
 
     /**
      * <p>
-     * Tag a resource with given tags.
+     * Adds tags to the specified MSK resource.
      * </p>
      * 
      * @param tagResourceRequest
      * @return Result of the TagResource operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @sample AWSKafka.TagResource
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/TagResource" target="_top">AWS API
      *      Documentation</a>
@@ -317,23 +535,99 @@ public interface AWSKafka {
 
     /**
      * <p>
-     * Remove tags of a resource by given tag keys.
+     * Removes the tags associated with the keys that are provided in the query.
      * </p>
      * 
      * @param untagResourceRequest
      * @return Result of the UntagResource operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @sample AWSKafka.UntagResource
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UntagResource" target="_top">AWS API
      *      Documentation</a>
      */
     UntagResourceResult untagResource(UntagResourceRequest untagResourceRequest);
 
+    /**
+     * <p>
+     * Updates the EBS storage associated with MSK brokers.
+     * </p>
+     * 
+     * @param updateBrokerStorageRequest
+     * @return Result of the UpdateBrokerStorage operation returned by the service.
+     * @throws ServiceUnavailableException
+     *         <p>
+     *         503 response
+     *         </p>
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @sample AWSKafka.UpdateBrokerStorage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerStorage" target="_top">AWS API
+     *      Documentation</a>
+     */
+    UpdateBrokerStorageResult updateBrokerStorage(UpdateBrokerStorageRequest updateBrokerStorageRequest);
+
+    /**
+     * <p>
+     * Updates the cluster with the configuration that is specified in the request body.
+     * </p>
+     * 
+     * @param updateClusterConfigurationRequest
+     * @return Result of the UpdateClusterConfiguration operation returned by the service.
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @throws NotFoundException
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
+     * @throws ServiceUnavailableException
+     *         <p>
+     *         503 response
+     *         </p>
+     * @sample AWSKafka.UpdateClusterConfiguration
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateClusterConfiguration"
+     *      target="_top">AWS API Documentation</a>
+     */
+    UpdateClusterConfigurationResult updateClusterConfiguration(UpdateClusterConfigurationRequest updateClusterConfigurationRequest);
+
     /**
      * Shuts down this client object, releasing any resources that might be held open. This is an optional method, and
      * callers are not expected to call it, but can if they want to explicitly release any open resources. Once a client
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsync.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsync.java
index 45848ed9d233..895ce2d14b60 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsync.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsync.java
@@ -25,6 +25,7 @@
  * {@link com.amazonaws.services.kafka.AbstractAWSKafkaAsync} instead.
  * </p>
  * <p>
+ * 
  * <p>
  * The operations for managing an Amazon MSK cluster.
  * </p>
@@ -156,6 +157,37 @@ java.util.concurrent.Future<DeleteClusterResult> deleteClusterAsync(DeleteCluste
     java.util.concurrent.Future<DescribeClusterResult> describeClusterAsync(DescribeClusterRequest describeClusterRequest,
             com.amazonaws.handlers.AsyncHandler<DescribeClusterRequest, DescribeClusterResult> asyncHandler);
 
+    /**
+     * <p>
+     * Returns a description of the cluster operation specified by the ARN.
+     * </p>
+     * 
+     * @param describeClusterOperationRequest
+     * @return A Java Future containing the result of the DescribeClusterOperation operation returned by the service.
+     * @sample AWSKafkaAsync.DescribeClusterOperation
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterOperation" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeClusterOperationResult> describeClusterOperationAsync(DescribeClusterOperationRequest describeClusterOperationRequest);
+
+    /**
+     * <p>
+     * Returns a description of the cluster operation specified by the ARN.
+     * </p>
+     * 
+     * @param describeClusterOperationRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the DescribeClusterOperation operation returned by the service.
+     * @sample AWSKafkaAsyncHandler.DescribeClusterOperation
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterOperation" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<DescribeClusterOperationResult> describeClusterOperationAsync(DescribeClusterOperationRequest describeClusterOperationRequest,
+            com.amazonaws.handlers.AsyncHandler<DescribeClusterOperationRequest, DescribeClusterOperationResult> asyncHandler);
+
     /**
      * <p>
      * Returns a description of this MSK configuration.
@@ -255,7 +287,38 @@ java.util.concurrent.Future<GetBootstrapBrokersResult> getBootstrapBrokersAsync(
 
     /**
      * <p>
-     * Returns a list of clusters in an account.
+     * Returns a list of all the operations that have been performed on the specified MSK cluster.
+     * </p>
+     * 
+     * @param listClusterOperationsRequest
+     * @return A Java Future containing the result of the ListClusterOperations operation returned by the service.
+     * @sample AWSKafkaAsync.ListClusterOperations
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusterOperations" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListClusterOperationsResult> listClusterOperationsAsync(ListClusterOperationsRequest listClusterOperationsRequest);
+
+    /**
+     * <p>
+     * Returns a list of all the operations that have been performed on the specified MSK cluster.
+     * </p>
+     * 
+     * @param listClusterOperationsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListClusterOperations operation returned by the service.
+     * @sample AWSKafkaAsyncHandler.ListClusterOperations
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusterOperations" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<ListClusterOperationsResult> listClusterOperationsAsync(ListClusterOperationsRequest listClusterOperationsRequest,
+            com.amazonaws.handlers.AsyncHandler<ListClusterOperationsRequest, ListClusterOperationsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Returns a list of all the MSK clusters in the current Region.
      * </p>
      * 
      * @param listClustersRequest
@@ -268,7 +331,7 @@ java.util.concurrent.Future<GetBootstrapBrokersResult> getBootstrapBrokersAsync(
 
     /**
      * <p>
-     * Returns a list of clusters in an account.
+     * Returns a list of all the MSK clusters in the current Region.
      * </p>
      * 
      * @param listClustersRequest
@@ -286,7 +349,40 @@ java.util.concurrent.Future<ListClustersResult> listClustersAsync(ListClustersRe
 
     /**
      * <p>
-     * Returns a list of all the MSK configurations in this Region for this account.
+     * Returns a list of all the MSK configurations in this Region.
+     * </p>
+     * 
+     * @param listConfigurationRevisionsRequest
+     * @return A Java Future containing the result of the ListConfigurationRevisions operation returned by the service.
+     * @sample AWSKafkaAsync.ListConfigurationRevisions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurationRevisions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<ListConfigurationRevisionsResult> listConfigurationRevisionsAsync(
+            ListConfigurationRevisionsRequest listConfigurationRevisionsRequest);
+
+    /**
+     * <p>
+     * Returns a list of all the MSK configurations in this Region.
+     * </p>
+     * 
+     * @param listConfigurationRevisionsRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListConfigurationRevisions operation returned by the service.
+     * @sample AWSKafkaAsyncHandler.ListConfigurationRevisions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurationRevisions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<ListConfigurationRevisionsResult> listConfigurationRevisionsAsync(
+            ListConfigurationRevisionsRequest listConfigurationRevisionsRequest,
+            com.amazonaws.handlers.AsyncHandler<ListConfigurationRevisionsRequest, ListConfigurationRevisionsResult> asyncHandler);
+
+    /**
+     * <p>
+     * Returns a list of all the MSK configurations in this Region.
      * </p>
      * 
      * @param listConfigurationsRequest
@@ -299,7 +395,7 @@ java.util.concurrent.Future<ListClustersResult> listClustersAsync(ListClustersRe
 
     /**
      * <p>
-     * Returns a list of all the MSK configurations in this Region for this account.
+     * Returns a list of all the MSK configurations in this Region.
      * </p>
      * 
      * @param listConfigurationsRequest
@@ -348,7 +444,7 @@ java.util.concurrent.Future<ListNodesResult> listNodesAsync(ListNodesRequest lis
 
     /**
      * <p>
-     * Returns a list of tags attached to a resource.
+     * Returns a list of the tags associated with the specified resource.
      * </p>
      * 
      * @param listTagsForResourceRequest
@@ -361,7 +457,7 @@ java.util.concurrent.Future<ListNodesResult> listNodesAsync(ListNodesRequest lis
 
     /**
      * <p>
-     * Returns a list of tags attached to a resource.
+     * Returns a list of the tags associated with the specified resource.
      * </p>
      * 
      * @param listTagsForResourceRequest
@@ -379,7 +475,7 @@ java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(
 
     /**
      * <p>
-     * Tag a resource with given tags.
+     * Adds tags to the specified MSK resource.
      * </p>
      * 
      * @param tagResourceRequest
@@ -392,7 +488,7 @@ java.util.concurrent.Future<ListTagsForResourceResult> listTagsForResourceAsync(
 
     /**
      * <p>
-     * Tag a resource with given tags.
+     * Adds tags to the specified MSK resource.
      * </p>
      * 
      * @param tagResourceRequest
@@ -410,7 +506,7 @@ java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceReque
 
     /**
      * <p>
-     * Remove tags of a resource by given tag keys.
+     * Removes the tags associated with the keys that are provided in the query.
      * </p>
      * 
      * @param untagResourceRequest
@@ -423,7 +519,7 @@ java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceReque
 
     /**
      * <p>
-     * Remove tags of a resource by given tag keys.
+     * Removes the tags associated with the keys that are provided in the query.
      * </p>
      * 
      * @param untagResourceRequest
@@ -439,4 +535,68 @@ java.util.concurrent.Future<TagResourceResult> tagResourceAsync(TagResourceReque
     java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(UntagResourceRequest untagResourceRequest,
             com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult> asyncHandler);
 
+    /**
+     * <p>
+     * Updates the EBS storage associated with MSK brokers.
+     * </p>
+     * 
+     * @param updateBrokerStorageRequest
+     * @return A Java Future containing the result of the UpdateBrokerStorage operation returned by the service.
+     * @sample AWSKafkaAsync.UpdateBrokerStorage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerStorage" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateBrokerStorageResult> updateBrokerStorageAsync(UpdateBrokerStorageRequest updateBrokerStorageRequest);
+
+    /**
+     * <p>
+     * Updates the EBS storage associated with MSK brokers.
+     * </p>
+     * 
+     * @param updateBrokerStorageRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the UpdateBrokerStorage operation returned by the service.
+     * @sample AWSKafkaAsyncHandler.UpdateBrokerStorage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerStorage" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateBrokerStorageResult> updateBrokerStorageAsync(UpdateBrokerStorageRequest updateBrokerStorageRequest,
+            com.amazonaws.handlers.AsyncHandler<UpdateBrokerStorageRequest, UpdateBrokerStorageResult> asyncHandler);
+
+    /**
+     * <p>
+     * Updates the cluster with the configuration that is specified in the request body.
+     * </p>
+     * 
+     * @param updateClusterConfigurationRequest
+     * @return A Java Future containing the result of the UpdateClusterConfiguration operation returned by the service.
+     * @sample AWSKafkaAsync.UpdateClusterConfiguration
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateClusterConfiguration"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateClusterConfigurationResult> updateClusterConfigurationAsync(
+            UpdateClusterConfigurationRequest updateClusterConfigurationRequest);
+
+    /**
+     * <p>
+     * Updates the cluster with the configuration that is specified in the request body.
+     * </p>
+     * 
+     * @param updateClusterConfigurationRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the UpdateClusterConfiguration operation returned by the service.
+     * @sample AWSKafkaAsyncHandler.UpdateClusterConfiguration
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateClusterConfiguration"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<UpdateClusterConfigurationResult> updateClusterConfigurationAsync(
+            UpdateClusterConfigurationRequest updateClusterConfigurationRequest,
+            com.amazonaws.handlers.AsyncHandler<UpdateClusterConfigurationRequest, UpdateClusterConfigurationResult> asyncHandler);
+
 }
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsyncClient.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsyncClient.java
index d3aed90eb78c..87ef00dae61c 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsyncClient.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaAsyncClient.java
@@ -25,6 +25,7 @@
  * asynchronous operation; overloads which accept an {@code AsyncHandler} can be used to receive notification when an
  * asynchronous operation completes.
  * <p>
+ * 
  * <p>
  * The operations for managing an Amazon MSK cluster.
  * </p>
@@ -193,6 +194,39 @@ public DescribeClusterResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<DescribeClusterOperationResult> describeClusterOperationAsync(DescribeClusterOperationRequest request) {
+
+        return describeClusterOperationAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeClusterOperationResult> describeClusterOperationAsync(final DescribeClusterOperationRequest request,
+            final com.amazonaws.handlers.AsyncHandler<DescribeClusterOperationRequest, DescribeClusterOperationResult> asyncHandler) {
+        final DescribeClusterOperationRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<DescribeClusterOperationResult>() {
+            @Override
+            public DescribeClusterOperationResult call() throws Exception {
+                DescribeClusterOperationResult result = null;
+
+                try {
+                    result = executeDescribeClusterOperation(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<DescribeConfigurationResult> describeConfigurationAsync(DescribeConfigurationRequest request) {
 
@@ -293,6 +327,39 @@ public GetBootstrapBrokersResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<ListClusterOperationsResult> listClusterOperationsAsync(ListClusterOperationsRequest request) {
+
+        return listClusterOperationsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListClusterOperationsResult> listClusterOperationsAsync(final ListClusterOperationsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListClusterOperationsRequest, ListClusterOperationsResult> asyncHandler) {
+        final ListClusterOperationsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListClusterOperationsResult>() {
+            @Override
+            public ListClusterOperationsResult call() throws Exception {
+                ListClusterOperationsResult result = null;
+
+                try {
+                    result = executeListClusterOperations(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<ListClustersResult> listClustersAsync(ListClustersRequest request) {
 
@@ -326,6 +393,39 @@ public ListClustersResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<ListConfigurationRevisionsResult> listConfigurationRevisionsAsync(ListConfigurationRevisionsRequest request) {
+
+        return listConfigurationRevisionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListConfigurationRevisionsResult> listConfigurationRevisionsAsync(final ListConfigurationRevisionsRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListConfigurationRevisionsRequest, ListConfigurationRevisionsResult> asyncHandler) {
+        final ListConfigurationRevisionsRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListConfigurationRevisionsResult>() {
+            @Override
+            public ListConfigurationRevisionsResult call() throws Exception {
+                ListConfigurationRevisionsResult result = null;
+
+                try {
+                    result = executeListConfigurationRevisions(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<ListConfigurationsResult> listConfigurationsAsync(ListConfigurationsRequest request) {
 
@@ -491,6 +591,72 @@ public UntagResourceResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<UpdateBrokerStorageResult> updateBrokerStorageAsync(UpdateBrokerStorageRequest request) {
+
+        return updateBrokerStorageAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateBrokerStorageResult> updateBrokerStorageAsync(final UpdateBrokerStorageRequest request,
+            final com.amazonaws.handlers.AsyncHandler<UpdateBrokerStorageRequest, UpdateBrokerStorageResult> asyncHandler) {
+        final UpdateBrokerStorageRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<UpdateBrokerStorageResult>() {
+            @Override
+            public UpdateBrokerStorageResult call() throws Exception {
+                UpdateBrokerStorageResult result = null;
+
+                try {
+                    result = executeUpdateBrokerStorage(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateClusterConfigurationResult> updateClusterConfigurationAsync(UpdateClusterConfigurationRequest request) {
+
+        return updateClusterConfigurationAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateClusterConfigurationResult> updateClusterConfigurationAsync(final UpdateClusterConfigurationRequest request,
+            final com.amazonaws.handlers.AsyncHandler<UpdateClusterConfigurationRequest, UpdateClusterConfigurationResult> asyncHandler) {
+        final UpdateClusterConfigurationRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<UpdateClusterConfigurationResult>() {
+            @Override
+            public UpdateClusterConfigurationResult call() throws Exception {
+                UpdateClusterConfigurationResult result = null;
+
+                try {
+                    result = executeUpdateClusterConfiguration(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     /**
      * Shuts down the client, releasing all managed resources. This includes forcibly terminating all pending
      * asynchronous service calls. Clients who wish to give pending asynchronous service calls time to complete should
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaClient.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaClient.java
index fdb09310e70c..da6dc2eda2ba 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaClient.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AWSKafkaClient.java
@@ -50,6 +50,7 @@
  * Client for accessing Kafka. All service calls made using this client are blocking, and will not return until the
  * service call completes.
  * <p>
+ * 
  * <p>
  * The operations for managing an Amazon MSK cluster.
  * </p>
@@ -157,19 +158,33 @@ private void init() {
      * @param createClusterRequest
      * @return Result of the CreateCluster operation returned by the service.
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @throws TooManyRequestsException
+     *         <p>
      *         429 response
+     *         </p>
      * @throws ConflictException
+     *         <p>
      *         This cluster name already exists. Retry your request using another name.
+     *         </p>
      * @sample AWSKafka.CreateCluster
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/CreateCluster" target="_top">AWS API
      *      Documentation</a>
@@ -224,19 +239,33 @@ final CreateClusterResult executeCreateCluster(CreateClusterRequest createCluste
      * @param createConfigurationRequest
      * @return Result of the CreateConfiguration operation returned by the service.
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @throws TooManyRequestsException
+     *         <p>
      *         429 response
+     *         </p>
      * @throws ConflictException
-     *         This configuration name already exists. Retry your request using another name.
+     *         <p>
+     *         This cluster name already exists. Retry your request using another name.
+     *         </p>
      * @sample AWSKafka.CreateConfiguration
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/CreateConfiguration" target="_top">AWS API
      *      Documentation</a>
@@ -291,13 +320,21 @@ final CreateConfigurationResult executeCreateConfiguration(CreateConfigurationRe
      * @param deleteClusterRequest
      * @return Result of the DeleteCluster operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.DeleteCluster
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DeleteCluster" target="_top">AWS API
      *      Documentation</a>
@@ -352,15 +389,25 @@ final DeleteClusterResult executeDeleteCluster(DeleteClusterRequest deleteCluste
      * @param describeClusterRequest
      * @return Result of the DescribeCluster operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.DescribeCluster
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeCluster" target="_top">AWS API
      *      Documentation</a>
@@ -407,6 +454,81 @@ final DescribeClusterResult executeDescribeCluster(DescribeClusterRequest descri
         }
     }
 
+    /**
+     * <p>
+     * Returns a description of the cluster operation specified by the ARN.
+     * </p>
+     * 
+     * @param describeClusterOperationRequest
+     * @return Result of the DescribeClusterOperation operation returned by the service.
+     * @throws NotFoundException
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @sample AWSKafka.DescribeClusterOperation
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterOperation" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public DescribeClusterOperationResult describeClusterOperation(DescribeClusterOperationRequest request) {
+        request = beforeClientExecution(request);
+        return executeDescribeClusterOperation(request);
+    }
+
+    @SdkInternalApi
+    final DescribeClusterOperationResult executeDescribeClusterOperation(DescribeClusterOperationRequest describeClusterOperationRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(describeClusterOperationRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<DescribeClusterOperationRequest> request = null;
+        Response<DescribeClusterOperationResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new DescribeClusterOperationRequestProtocolMarshaller(protocolFactory).marshall(super
+                        .beforeMarshalling(describeClusterOperationRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Kafka");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "DescribeClusterOperation");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<DescribeClusterOperationResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                    new DescribeClusterOperationResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Returns a description of this MSK configuration.
@@ -415,17 +537,29 @@ final DescribeClusterResult executeDescribeCluster(DescribeClusterRequest descri
      * @param describeConfigurationRequest
      * @return Result of the DescribeConfiguration operation returned by the service.
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws NotFoundException
+     *         <p>
      *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @sample AWSKafka.DescribeConfiguration
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeConfiguration" target="_top">AWS
      *      API Documentation</a>
@@ -481,17 +615,29 @@ final DescribeConfigurationResult executeDescribeConfiguration(DescribeConfigura
      * @param describeConfigurationRevisionRequest
      * @return Result of the DescribeConfigurationRevision operation returned by the service.
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @throws NotFoundException
+     *         <p>
      *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @sample AWSKafka.DescribeConfigurationRevision
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeConfigurationRevision"
      *      target="_top">AWS API Documentation</a>
@@ -548,15 +694,25 @@ final DescribeConfigurationRevisionResult executeDescribeConfigurationRevision(D
      * @param getBootstrapBrokersRequest
      * @return Result of the GetBootstrapBrokers operation returned by the service.
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ConflictException
+     *         <p>
      *         This cluster name already exists. Retry your request using another name.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.GetBootstrapBrokers
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/GetBootstrapBrokers" target="_top">AWS API
      *      Documentation</a>
@@ -605,19 +761,97 @@ final GetBootstrapBrokersResult executeGetBootstrapBrokers(GetBootstrapBrokersRe
 
     /**
      * <p>
-     * Returns a list of clusters in an account.
+     * Returns a list of all the operations that have been performed on the specified MSK cluster.
+     * </p>
+     * 
+     * @param listClusterOperationsRequest
+     * @return Result of the ListClusterOperations operation returned by the service.
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @sample AWSKafka.ListClusterOperations
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusterOperations" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public ListClusterOperationsResult listClusterOperations(ListClusterOperationsRequest request) {
+        request = beforeClientExecution(request);
+        return executeListClusterOperations(request);
+    }
+
+    @SdkInternalApi
+    final ListClusterOperationsResult executeListClusterOperations(ListClusterOperationsRequest listClusterOperationsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listClusterOperationsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListClusterOperationsRequest> request = null;
+        Response<ListClusterOperationsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListClusterOperationsRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(listClusterOperationsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Kafka");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListClusterOperations");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListClusterOperationsResult>> responseHandler = protocolFactory
+                    .createResponseHandler(new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                            new ListClusterOperationsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Returns a list of all the MSK clusters in the current Region.
      * </p>
      * 
      * @param listClustersRequest
      * @return Result of the ListClusters operation returned by the service.
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.ListClusters
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusters" target="_top">AWS API
      *      Documentation</a>
@@ -666,21 +900,110 @@ final ListClustersResult executeListClusters(ListClustersRequest listClustersReq
 
     /**
      * <p>
-     * Returns a list of all the MSK configurations in this Region for this account.
+     * Returns a list of all the MSK configurations in this Region.
+     * </p>
+     * 
+     * @param listConfigurationRevisionsRequest
+     * @return Result of the ListConfigurationRevisions operation returned by the service.
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @throws NotFoundException
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
+     * @throws ServiceUnavailableException
+     *         <p>
+     *         503 response
+     *         </p>
+     * @sample AWSKafka.ListConfigurationRevisions
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurationRevisions"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public ListConfigurationRevisionsResult listConfigurationRevisions(ListConfigurationRevisionsRequest request) {
+        request = beforeClientExecution(request);
+        return executeListConfigurationRevisions(request);
+    }
+
+    @SdkInternalApi
+    final ListConfigurationRevisionsResult executeListConfigurationRevisions(ListConfigurationRevisionsRequest listConfigurationRevisionsRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listConfigurationRevisionsRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListConfigurationRevisionsRequest> request = null;
+        Response<ListConfigurationRevisionsResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListConfigurationRevisionsRequestProtocolMarshaller(protocolFactory).marshall(super
+                        .beforeMarshalling(listConfigurationRevisionsRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Kafka");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListConfigurationRevisions");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListConfigurationRevisionsResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                    new ListConfigurationRevisionsResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Returns a list of all the MSK configurations in this Region.
      * </p>
      * 
      * @param listConfigurationsRequest
      * @return Result of the ListConfigurations operation returned by the service.
      * @throws ServiceUnavailableException
+     *         <p>
      *         503 response
+     *         </p>
      * @throws BadRequestException
-     *         Because of incorrect input, the request isn't valid. Correct the input, then retry the request.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws UnauthorizedException
+     *         <p>
      *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.ListConfigurations
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurations" target="_top">AWS API
      *      Documentation</a>
@@ -735,13 +1058,21 @@ final ListConfigurationsResult executeListConfigurations(ListConfigurationsReque
      * @param listNodesRequest
      * @return Result of the ListNodes operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @throws ForbiddenException
+     *         <p>
      *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
      * @sample AWSKafka.ListNodes
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListNodes" target="_top">AWS API
      *      Documentation</a>
@@ -790,17 +1121,23 @@ final ListNodesResult executeListNodes(ListNodesRequest listNodesRequest) {
 
     /**
      * <p>
-     * Returns a list of tags attached to a resource.
+     * Returns a list of the tags associated with the specified resource.
      * </p>
      * 
      * @param listTagsForResourceRequest
      * @return Result of the ListTagsForResource operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @sample AWSKafka.ListTagsForResource
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListTagsForResource" target="_top">AWS API
      *      Documentation</a>
@@ -849,17 +1186,23 @@ final ListTagsForResourceResult executeListTagsForResource(ListTagsForResourceRe
 
     /**
      * <p>
-     * Tag a resource with given tags.
+     * Adds tags to the specified MSK resource.
      * </p>
      * 
      * @param tagResourceRequest
      * @return Result of the TagResource operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @sample AWSKafka.TagResource
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/TagResource" target="_top">AWS API
      *      Documentation</a>
@@ -908,17 +1251,23 @@ final TagResourceResult executeTagResource(TagResourceRequest tagResourceRequest
 
     /**
      * <p>
-     * Remove tags of a resource by given tag keys.
+     * Removes the tags associated with the keys that are provided in the query.
      * </p>
      * 
      * @param untagResourceRequest
      * @return Result of the UntagResource operation returned by the service.
      * @throws NotFoundException
-     *         The resource could not be found due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
      * @throws BadRequestException
-     *         Bad request due to incorrect input. Correct your request and then retry it.
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
      * @throws InternalServerErrorException
+     *         <p>
      *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
      * @sample AWSKafka.UntagResource
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UntagResource" target="_top">AWS API
      *      Documentation</a>
@@ -965,6 +1314,158 @@ final UntagResourceResult executeUntagResource(UntagResourceRequest untagResourc
         }
     }
 
+    /**
+     * <p>
+     * Updates the EBS storage associated with MSK brokers.
+     * </p>
+     * 
+     * @param updateBrokerStorageRequest
+     * @return Result of the UpdateBrokerStorage operation returned by the service.
+     * @throws ServiceUnavailableException
+     *         <p>
+     *         503 response
+     *         </p>
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @sample AWSKafka.UpdateBrokerStorage
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerStorage" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public UpdateBrokerStorageResult updateBrokerStorage(UpdateBrokerStorageRequest request) {
+        request = beforeClientExecution(request);
+        return executeUpdateBrokerStorage(request);
+    }
+
+    @SdkInternalApi
+    final UpdateBrokerStorageResult executeUpdateBrokerStorage(UpdateBrokerStorageRequest updateBrokerStorageRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(updateBrokerStorageRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<UpdateBrokerStorageRequest> request = null;
+        Response<UpdateBrokerStorageResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new UpdateBrokerStorageRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(updateBrokerStorageRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Kafka");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UpdateBrokerStorage");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<UpdateBrokerStorageResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new UpdateBrokerStorageResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Updates the cluster with the configuration that is specified in the request body.
+     * </p>
+     * 
+     * @param updateClusterConfigurationRequest
+     * @return Result of the UpdateClusterConfiguration operation returned by the service.
+     * @throws BadRequestException
+     *         <p>
+     *         The request isn't valid because the input is incorrect. Correct your input and then submit it again.
+     *         </p>
+     * @throws UnauthorizedException
+     *         <p>
+     *         The request is not authorized. The provided credentials couldn't be validated.
+     *         </p>
+     * @throws InternalServerErrorException
+     *         <p>
+     *         There was an unexpected internal server error. Retrying your request might resolve the issue.
+     *         </p>
+     * @throws ForbiddenException
+     *         <p>
+     *         Access forbidden. Check your credentials and then retry your request.
+     *         </p>
+     * @throws NotFoundException
+     *         <p>
+     *         The resource could not be found due to incorrect input. Correct the input, then retry the request.
+     *         </p>
+     * @throws ServiceUnavailableException
+     *         <p>
+     *         503 response
+     *         </p>
+     * @sample AWSKafka.UpdateClusterConfiguration
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateClusterConfiguration"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public UpdateClusterConfigurationResult updateClusterConfiguration(UpdateClusterConfigurationRequest request) {
+        request = beforeClientExecution(request);
+        return executeUpdateClusterConfiguration(request);
+    }
+
+    @SdkInternalApi
+    final UpdateClusterConfigurationResult executeUpdateClusterConfiguration(UpdateClusterConfigurationRequest updateClusterConfigurationRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(updateClusterConfigurationRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<UpdateClusterConfigurationRequest> request = null;
+        Response<UpdateClusterConfigurationResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new UpdateClusterConfigurationRequestProtocolMarshaller(protocolFactory).marshall(super
+                        .beforeMarshalling(updateClusterConfigurationRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Kafka");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "UpdateClusterConfiguration");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<UpdateClusterConfigurationResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                    new UpdateClusterConfigurationResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * Returns additional metadata for a previously executed successful, request, typically used for debugging issues
      * where a service isn't acting as expected. This data isn't considered part of the result data returned by an
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafka.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafka.java
index e3e4d14c5952..e3e79538758e 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafka.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafka.java
@@ -47,6 +47,11 @@ public DescribeClusterResult describeCluster(DescribeClusterRequest request) {
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public DescribeClusterOperationResult describeClusterOperation(DescribeClusterOperationRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public DescribeConfigurationResult describeConfiguration(DescribeConfigurationRequest request) {
         throw new java.lang.UnsupportedOperationException();
@@ -62,11 +67,21 @@ public GetBootstrapBrokersResult getBootstrapBrokers(GetBootstrapBrokersRequest
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public ListClusterOperationsResult listClusterOperations(ListClusterOperationsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public ListClustersResult listClusters(ListClustersRequest request) {
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public ListConfigurationRevisionsResult listConfigurationRevisions(ListConfigurationRevisionsRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public ListConfigurationsResult listConfigurations(ListConfigurationsRequest request) {
         throw new java.lang.UnsupportedOperationException();
@@ -92,6 +107,16 @@ public UntagResourceResult untagResource(UntagResourceRequest request) {
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public UpdateBrokerStorageResult updateBrokerStorage(UpdateBrokerStorageRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public UpdateClusterConfigurationResult updateClusterConfiguration(UpdateClusterConfigurationRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public void shutdown() {
         throw new java.lang.UnsupportedOperationException();
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafkaAsync.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafkaAsync.java
index d2ed4a9946ce..683414ef606e 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafkaAsync.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/AbstractAWSKafkaAsync.java
@@ -78,6 +78,19 @@ public java.util.concurrent.Future<DescribeClusterResult> describeClusterAsync(D
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<DescribeClusterOperationResult> describeClusterOperationAsync(DescribeClusterOperationRequest request) {
+
+        return describeClusterOperationAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<DescribeClusterOperationResult> describeClusterOperationAsync(DescribeClusterOperationRequest request,
+            com.amazonaws.handlers.AsyncHandler<DescribeClusterOperationRequest, DescribeClusterOperationResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<DescribeConfigurationResult> describeConfigurationAsync(DescribeConfigurationRequest request) {
 
@@ -117,6 +130,19 @@ public java.util.concurrent.Future<GetBootstrapBrokersResult> getBootstrapBroker
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<ListClusterOperationsResult> listClusterOperationsAsync(ListClusterOperationsRequest request) {
+
+        return listClusterOperationsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListClusterOperationsResult> listClusterOperationsAsync(ListClusterOperationsRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListClusterOperationsRequest, ListClusterOperationsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<ListClustersResult> listClustersAsync(ListClustersRequest request) {
 
@@ -130,6 +156,19 @@ public java.util.concurrent.Future<ListClustersResult> listClustersAsync(ListClu
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<ListConfigurationRevisionsResult> listConfigurationRevisionsAsync(ListConfigurationRevisionsRequest request) {
+
+        return listConfigurationRevisionsAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListConfigurationRevisionsResult> listConfigurationRevisionsAsync(ListConfigurationRevisionsRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListConfigurationRevisionsRequest, ListConfigurationRevisionsResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<ListConfigurationsResult> listConfigurationsAsync(ListConfigurationsRequest request) {
 
@@ -195,4 +234,30 @@ public java.util.concurrent.Future<UntagResourceResult> untagResourceAsync(Untag
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<UpdateBrokerStorageResult> updateBrokerStorageAsync(UpdateBrokerStorageRequest request) {
+
+        return updateBrokerStorageAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateBrokerStorageResult> updateBrokerStorageAsync(UpdateBrokerStorageRequest request,
+            com.amazonaws.handlers.AsyncHandler<UpdateBrokerStorageRequest, UpdateBrokerStorageResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateClusterConfigurationResult> updateClusterConfigurationAsync(UpdateClusterConfigurationRequest request) {
+
+        return updateClusterConfigurationAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<UpdateClusterConfigurationResult> updateClusterConfigurationAsync(UpdateClusterConfigurationRequest request,
+            com.amazonaws.handlers.AsyncHandler<UpdateClusterConfigurationRequest, UpdateClusterConfigurationResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
 }
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BadRequestException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BadRequestException.java
index 22dd9c66938a..ce3388fe4dd4 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BadRequestException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BadRequestException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public BadRequestException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerAZDistribution.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerAZDistribution.java
index 69794fa25469..be25e15e2fac 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerAZDistribution.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerAZDistribution.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * The distribution of broker nodes across Availability Zones. By default, broker nodes are distributed among three
  * Availability Zones. Currently, the only supported value is DEFAULT. You can either specify this value explicitly or
  * leave it out.
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerEBSVolumeInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerEBSVolumeInfo.java
new file mode 100644
index 000000000000..26163f5a185f
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerEBSVolumeInfo.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * Specifies the EBS volume upgrade information. The broker identifier must be set to the keyword ALL. This means the
+ * changes apply to all the brokers in the cluster.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/BrokerEBSVolumeInfo" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BrokerEBSVolumeInfo implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ID of the broker to update.
+     * </p>
+     */
+    private String kafkaBrokerNodeId;
+    /**
+     * <p>
+     * Size of the EBS volume to update.
+     * </p>
+     */
+    private Integer volumeSizeGB;
+
+    /**
+     * <p>
+     * The ID of the broker to update.
+     * </p>
+     * 
+     * @param kafkaBrokerNodeId
+     *        <p>
+     *        The ID of the broker to update.
+     *        </p>
+     */
+
+    public void setKafkaBrokerNodeId(String kafkaBrokerNodeId) {
+        this.kafkaBrokerNodeId = kafkaBrokerNodeId;
+    }
+
+    /**
+     * <p>
+     * The ID of the broker to update.
+     * </p>
+     * 
+     * @return <p>
+     *         The ID of the broker to update.
+     *         </p>
+     */
+
+    public String getKafkaBrokerNodeId() {
+        return this.kafkaBrokerNodeId;
+    }
+
+    /**
+     * <p>
+     * The ID of the broker to update.
+     * </p>
+     * 
+     * @param kafkaBrokerNodeId
+     *        <p>
+     *        The ID of the broker to update.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BrokerEBSVolumeInfo withKafkaBrokerNodeId(String kafkaBrokerNodeId) {
+        setKafkaBrokerNodeId(kafkaBrokerNodeId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Size of the EBS volume to update.
+     * </p>
+     * 
+     * @param volumeSizeGB
+     *        <p>
+     *        Size of the EBS volume to update.
+     *        </p>
+     */
+
+    public void setVolumeSizeGB(Integer volumeSizeGB) {
+        this.volumeSizeGB = volumeSizeGB;
+    }
+
+    /**
+     * <p>
+     * Size of the EBS volume to update.
+     * </p>
+     * 
+     * @return <p>
+     *         Size of the EBS volume to update.
+     *         </p>
+     */
+
+    public Integer getVolumeSizeGB() {
+        return this.volumeSizeGB;
+    }
+
+    /**
+     * <p>
+     * Size of the EBS volume to update.
+     * </p>
+     * 
+     * @param volumeSizeGB
+     *        <p>
+     *        Size of the EBS volume to update.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BrokerEBSVolumeInfo withVolumeSizeGB(Integer volumeSizeGB) {
+        setVolumeSizeGB(volumeSizeGB);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getKafkaBrokerNodeId() != null)
+            sb.append("KafkaBrokerNodeId: ").append(getKafkaBrokerNodeId()).append(",");
+        if (getVolumeSizeGB() != null)
+            sb.append("VolumeSizeGB: ").append(getVolumeSizeGB());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BrokerEBSVolumeInfo == false)
+            return false;
+        BrokerEBSVolumeInfo other = (BrokerEBSVolumeInfo) obj;
+        if (other.getKafkaBrokerNodeId() == null ^ this.getKafkaBrokerNodeId() == null)
+            return false;
+        if (other.getKafkaBrokerNodeId() != null && other.getKafkaBrokerNodeId().equals(this.getKafkaBrokerNodeId()) == false)
+            return false;
+        if (other.getVolumeSizeGB() == null ^ this.getVolumeSizeGB() == null)
+            return false;
+        if (other.getVolumeSizeGB() != null && other.getVolumeSizeGB().equals(this.getVolumeSizeGB()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getKafkaBrokerNodeId() == null) ? 0 : getKafkaBrokerNodeId().hashCode());
+        hashCode = prime * hashCode + ((getVolumeSizeGB() == null) ? 0 : getVolumeSizeGB().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BrokerEBSVolumeInfo clone() {
+        try {
+            return (BrokerEBSVolumeInfo) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.BrokerEBSVolumeInfoMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeGroupInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeGroupInfo.java
index be4ba3ec48c8..9e0ef4d1f50b 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeGroupInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeGroupInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Describes the setup to be used for Kafka broker nodes in the cluster.
  * </p>
  * 
@@ -52,7 +53,8 @@ public class BrokerNodeGroupInfo implements Serializable, Cloneable, StructuredP
     /**
      * <p>
      * The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to
-     * and communicate with the Amazon MSK cluster.
+     * and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default
+     * security group associated with the VPC.
      * </p>
      */
     private java.util.List<String> securityGroups;
@@ -69,7 +71,9 @@ public class BrokerNodeGroupInfo implements Serializable, Cloneable, StructuredP
      * </p>
      * 
      * @param brokerAZDistribution
+     *        <p>
      *        The distribution of broker nodes across Availability Zones.
+     *        </p>
      * @see BrokerAZDistribution
      */
 
@@ -82,7 +86,9 @@ public void setBrokerAZDistribution(String brokerAZDistribution) {
      * The distribution of broker nodes across Availability Zones.
      * </p>
      * 
-     * @return The distribution of broker nodes across Availability Zones.
+     * @return <p>
+     *         The distribution of broker nodes across Availability Zones.
+     *         </p>
      * @see BrokerAZDistribution
      */
 
@@ -96,7 +102,9 @@ public String getBrokerAZDistribution() {
      * </p>
      * 
      * @param brokerAZDistribution
+     *        <p>
      *        The distribution of broker nodes across Availability Zones.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see BrokerAZDistribution
      */
@@ -112,7 +120,9 @@ public BrokerNodeGroupInfo withBrokerAZDistribution(String brokerAZDistribution)
      * </p>
      * 
      * @param brokerAZDistribution
+     *        <p>
      *        The distribution of broker nodes across Availability Zones.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see BrokerAZDistribution
      */
@@ -129,9 +139,11 @@ public BrokerNodeGroupInfo withBrokerAZDistribution(BrokerAZDistribution brokerA
      * Client subnets can't be in Availability Zone us-east-1e.
      * </p>
      * 
-     * @return The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network
+     * @return <p>
+     *         The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network
      *         interfaces inside these subnets. Client applications use elastic network interfaces to produce and
      *         consume data. Client subnets can't be in Availability Zone us-east-1e.
+     *         </p>
      */
 
     public java.util.List<String> getClientSubnets() {
@@ -146,9 +158,11 @@ public java.util.List<String> getClientSubnets() {
      * </p>
      * 
      * @param clientSubnets
+     *        <p>
      *        The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network
      *        interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume
      *        data. Client subnets can't be in Availability Zone us-east-1e.
+     *        </p>
      */
 
     public void setClientSubnets(java.util.Collection<String> clientSubnets) {
@@ -166,6 +180,7 @@ public void setClientSubnets(java.util.Collection<String> clientSubnets) {
      * interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data.
      * Client subnets can't be in Availability Zone us-east-1e.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setClientSubnets(java.util.Collection)} or {@link #withClientSubnets(java.util.Collection)} if you want
@@ -173,9 +188,11 @@ public void setClientSubnets(java.util.Collection<String> clientSubnets) {
      * </p>
      * 
      * @param clientSubnets
+     *        <p>
      *        The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network
      *        interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume
      *        data. Client subnets can't be in Availability Zone us-east-1e.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -197,9 +214,11 @@ public BrokerNodeGroupInfo withClientSubnets(String... clientSubnets) {
      * </p>
      * 
      * @param clientSubnets
+     *        <p>
      *        The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network
      *        interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume
      *        data. Client subnets can't be in Availability Zone us-east-1e.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -215,9 +234,11 @@ public BrokerNodeGroupInfo withClientSubnets(java.util.Collection<String> client
      * </p>
      * 
      * @param instanceType
+     *        <p>
      *        The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed:
      *        kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge, kafka.m5.4xlarge, kafka.m5.12xlarge, and
      *        kafka.m5.24xlarge.
+     *        </p>
      */
 
     public void setInstanceType(String instanceType) {
@@ -230,9 +251,11 @@ public void setInstanceType(String instanceType) {
      * kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge, kafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.
      * </p>
      * 
-     * @return The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed:
+     * @return <p>
+     *         The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed:
      *         kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge, kafka.m5.4xlarge, kafka.m5.12xlarge, and
      *         kafka.m5.24xlarge.
+     *         </p>
      */
 
     public String getInstanceType() {
@@ -246,9 +269,11 @@ public String getInstanceType() {
      * </p>
      * 
      * @param instanceType
+     *        <p>
      *        The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed:
      *        kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge, kafka.m5.4xlarge, kafka.m5.12xlarge, and
      *        kafka.m5.24xlarge.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -260,11 +285,15 @@ public BrokerNodeGroupInfo withInstanceType(String instanceType) {
     /**
      * <p>
      * The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to
-     * and communicate with the Amazon MSK cluster.
+     * and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default
+     * security group associated with the VPC.
      * </p>
      * 
-     * @return The AWS security groups to associate with the elastic network interfaces in order to specify who can
-     *         connect to and communicate with the Amazon MSK cluster.
+     * @return <p>
+     *         The AWS security groups to associate with the elastic network interfaces in order to specify who can
+     *         connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK
+     *         uses the default security group associated with the VPC.
+     *         </p>
      */
 
     public java.util.List<String> getSecurityGroups() {
@@ -274,12 +303,16 @@ public java.util.List<String> getSecurityGroups() {
     /**
      * <p>
      * The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to
-     * and communicate with the Amazon MSK cluster.
+     * and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default
+     * security group associated with the VPC.
      * </p>
      * 
      * @param securityGroups
+     *        <p>
      *        The AWS security groups to associate with the elastic network interfaces in order to specify who can
-     *        connect to and communicate with the Amazon MSK cluster.
+     *        connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK
+     *        uses the default security group associated with the VPC.
+     *        </p>
      */
 
     public void setSecurityGroups(java.util.Collection<String> securityGroups) {
@@ -294,8 +327,10 @@ public void setSecurityGroups(java.util.Collection<String> securityGroups) {
     /**
      * <p>
      * The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to
-     * and communicate with the Amazon MSK cluster.
+     * and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default
+     * security group associated with the VPC.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setSecurityGroups(java.util.Collection)} or {@link #withSecurityGroups(java.util.Collection)} if you want
@@ -303,8 +338,11 @@ public void setSecurityGroups(java.util.Collection<String> securityGroups) {
      * </p>
      * 
      * @param securityGroups
+     *        <p>
      *        The AWS security groups to associate with the elastic network interfaces in order to specify who can
-     *        connect to and communicate with the Amazon MSK cluster.
+     *        connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK
+     *        uses the default security group associated with the VPC.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -321,12 +359,16 @@ public BrokerNodeGroupInfo withSecurityGroups(String... securityGroups) {
     /**
      * <p>
      * The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to
-     * and communicate with the Amazon MSK cluster.
+     * and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default
+     * security group associated with the VPC.
      * </p>
      * 
      * @param securityGroups
+     *        <p>
      *        The AWS security groups to associate with the elastic network interfaces in order to specify who can
-     *        connect to and communicate with the Amazon MSK cluster.
+     *        connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK
+     *        uses the default security group associated with the VPC.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -341,7 +383,9 @@ public BrokerNodeGroupInfo withSecurityGroups(java.util.Collection<String> secur
      * </p>
      * 
      * @param storageInfo
+     *        <p>
      *        Contains information about storage volumes attached to MSK broker nodes.
+     *        </p>
      */
 
     public void setStorageInfo(StorageInfo storageInfo) {
@@ -353,7 +397,9 @@ public void setStorageInfo(StorageInfo storageInfo) {
      * Contains information about storage volumes attached to MSK broker nodes.
      * </p>
      * 
-     * @return Contains information about storage volumes attached to MSK broker nodes.
+     * @return <p>
+     *         Contains information about storage volumes attached to MSK broker nodes.
+     *         </p>
      */
 
     public StorageInfo getStorageInfo() {
@@ -366,7 +412,9 @@ public StorageInfo getStorageInfo() {
      * </p>
      * 
      * @param storageInfo
+     *        <p>
      *        Contains information about storage volumes attached to MSK broker nodes.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeInfo.java
index e7335ce42542..d0fbb2b0bb1d 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerNodeInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * BrokerNodeInfo
  * </p>
  * 
@@ -58,6 +59,12 @@ public class BrokerNodeInfo implements Serializable, Cloneable, StructuredPojo {
      * </p>
      */
     private BrokerSoftwareInfo currentBrokerSoftwareInfo;
+    /**
+     * <p>
+     * Endpoints for accessing the broker.
+     * </p>
+     */
+    private java.util.List<String> endpoints;
 
     /**
      * <p>
@@ -65,7 +72,9 @@ public class BrokerNodeInfo implements Serializable, Cloneable, StructuredPojo {
      * </p>
      * 
      * @param attachedENIId
+     *        <p>
      *        The attached elastic network interface of the broker.
+     *        </p>
      */
 
     public void setAttachedENIId(String attachedENIId) {
@@ -77,7 +86,9 @@ public void setAttachedENIId(String attachedENIId) {
      * The attached elastic network interface of the broker.
      * </p>
      * 
-     * @return The attached elastic network interface of the broker.
+     * @return <p>
+     *         The attached elastic network interface of the broker.
+     *         </p>
      */
 
     public String getAttachedENIId() {
@@ -90,7 +101,9 @@ public String getAttachedENIId() {
      * </p>
      * 
      * @param attachedENIId
+     *        <p>
      *        The attached elastic network interface of the broker.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -105,7 +118,9 @@ public BrokerNodeInfo withAttachedENIId(String attachedENIId) {
      * </p>
      * 
      * @param brokerId
+     *        <p>
      *        The ID of the broker.
+     *        </p>
      */
 
     public void setBrokerId(Double brokerId) {
@@ -117,7 +132,9 @@ public void setBrokerId(Double brokerId) {
      * The ID of the broker.
      * </p>
      * 
-     * @return The ID of the broker.
+     * @return <p>
+     *         The ID of the broker.
+     *         </p>
      */
 
     public Double getBrokerId() {
@@ -130,7 +147,9 @@ public Double getBrokerId() {
      * </p>
      * 
      * @param brokerId
+     *        <p>
      *        The ID of the broker.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -145,7 +164,9 @@ public BrokerNodeInfo withBrokerId(Double brokerId) {
      * </p>
      * 
      * @param clientSubnet
+     *        <p>
      *        The client subnet to which this broker node belongs.
+     *        </p>
      */
 
     public void setClientSubnet(String clientSubnet) {
@@ -157,7 +178,9 @@ public void setClientSubnet(String clientSubnet) {
      * The client subnet to which this broker node belongs.
      * </p>
      * 
-     * @return The client subnet to which this broker node belongs.
+     * @return <p>
+     *         The client subnet to which this broker node belongs.
+     *         </p>
      */
 
     public String getClientSubnet() {
@@ -170,7 +193,9 @@ public String getClientSubnet() {
      * </p>
      * 
      * @param clientSubnet
+     *        <p>
      *        The client subnet to which this broker node belongs.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -185,7 +210,9 @@ public BrokerNodeInfo withClientSubnet(String clientSubnet) {
      * </p>
      * 
      * @param clientVpcIpAddress
+     *        <p>
      *        The virtual private cloud (VPC) of the client.
+     *        </p>
      */
 
     public void setClientVpcIpAddress(String clientVpcIpAddress) {
@@ -197,7 +224,9 @@ public void setClientVpcIpAddress(String clientVpcIpAddress) {
      * The virtual private cloud (VPC) of the client.
      * </p>
      * 
-     * @return The virtual private cloud (VPC) of the client.
+     * @return <p>
+     *         The virtual private cloud (VPC) of the client.
+     *         </p>
      */
 
     public String getClientVpcIpAddress() {
@@ -210,7 +239,9 @@ public String getClientVpcIpAddress() {
      * </p>
      * 
      * @param clientVpcIpAddress
+     *        <p>
      *        The virtual private cloud (VPC) of the client.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -225,7 +256,9 @@ public BrokerNodeInfo withClientVpcIpAddress(String clientVpcIpAddress) {
      * </p>
      * 
      * @param currentBrokerSoftwareInfo
+     *        <p>
      *        Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     *        </p>
      */
 
     public void setCurrentBrokerSoftwareInfo(BrokerSoftwareInfo currentBrokerSoftwareInfo) {
@@ -237,7 +270,9 @@ public void setCurrentBrokerSoftwareInfo(BrokerSoftwareInfo currentBrokerSoftwar
      * Information about the version of software currently deployed on the Kafka brokers in the cluster.
      * </p>
      * 
-     * @return Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     * @return <p>
+     *         Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     *         </p>
      */
 
     public BrokerSoftwareInfo getCurrentBrokerSoftwareInfo() {
@@ -250,7 +285,9 @@ public BrokerSoftwareInfo getCurrentBrokerSoftwareInfo() {
      * </p>
      * 
      * @param currentBrokerSoftwareInfo
+     *        <p>
      *        Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -259,6 +296,85 @@ public BrokerNodeInfo withCurrentBrokerSoftwareInfo(BrokerSoftwareInfo currentBr
         return this;
     }
 
+    /**
+     * <p>
+     * Endpoints for accessing the broker.
+     * </p>
+     * 
+     * @return <p>
+     *         Endpoints for accessing the broker.
+     *         </p>
+     */
+
+    public java.util.List<String> getEndpoints() {
+        return endpoints;
+    }
+
+    /**
+     * <p>
+     * Endpoints for accessing the broker.
+     * </p>
+     * 
+     * @param endpoints
+     *        <p>
+     *        Endpoints for accessing the broker.
+     *        </p>
+     */
+
+    public void setEndpoints(java.util.Collection<String> endpoints) {
+        if (endpoints == null) {
+            this.endpoints = null;
+            return;
+        }
+
+        this.endpoints = new java.util.ArrayList<String>(endpoints);
+    }
+
+    /**
+     * <p>
+     * Endpoints for accessing the broker.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setEndpoints(java.util.Collection)} or {@link #withEndpoints(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param endpoints
+     *        <p>
+     *        Endpoints for accessing the broker.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BrokerNodeInfo withEndpoints(String... endpoints) {
+        if (this.endpoints == null) {
+            setEndpoints(new java.util.ArrayList<String>(endpoints.length));
+        }
+        for (String ele : endpoints) {
+            this.endpoints.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Endpoints for accessing the broker.
+     * </p>
+     * 
+     * @param endpoints
+     *        <p>
+     *        Endpoints for accessing the broker.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BrokerNodeInfo withEndpoints(java.util.Collection<String> endpoints) {
+        setEndpoints(endpoints);
+        return this;
+    }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -280,7 +396,9 @@ public String toString() {
         if (getClientVpcIpAddress() != null)
             sb.append("ClientVpcIpAddress: ").append(getClientVpcIpAddress()).append(",");
         if (getCurrentBrokerSoftwareInfo() != null)
-            sb.append("CurrentBrokerSoftwareInfo: ").append(getCurrentBrokerSoftwareInfo());
+            sb.append("CurrentBrokerSoftwareInfo: ").append(getCurrentBrokerSoftwareInfo()).append(",");
+        if (getEndpoints() != null)
+            sb.append("Endpoints: ").append(getEndpoints());
         sb.append("}");
         return sb.toString();
     }
@@ -315,6 +433,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getCurrentBrokerSoftwareInfo() != null && other.getCurrentBrokerSoftwareInfo().equals(this.getCurrentBrokerSoftwareInfo()) == false)
             return false;
+        if (other.getEndpoints() == null ^ this.getEndpoints() == null)
+            return false;
+        if (other.getEndpoints() != null && other.getEndpoints().equals(this.getEndpoints()) == false)
+            return false;
         return true;
     }
 
@@ -328,6 +450,7 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getClientSubnet() == null) ? 0 : getClientSubnet().hashCode());
         hashCode = prime * hashCode + ((getClientVpcIpAddress() == null) ? 0 : getClientVpcIpAddress().hashCode());
         hashCode = prime * hashCode + ((getCurrentBrokerSoftwareInfo() == null) ? 0 : getCurrentBrokerSoftwareInfo().hashCode());
+        hashCode = prime * hashCode + ((getEndpoints() == null) ? 0 : getEndpoints().hashCode());
         return hashCode;
     }
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerSoftwareInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerSoftwareInfo.java
index 87d08b93d949..9d601bcbe3c0 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerSoftwareInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/BrokerSoftwareInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Information about the current software installed on the cluster.
  * </p>
  * 
@@ -30,13 +31,14 @@ public class BrokerSoftwareInfo implements Serializable, Cloneable, StructuredPo
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     * The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this
+     * preview release.
      * </p>
      */
     private String configurationArn;
     /**
      * <p>
-     * The revision of the configuration to use.
+     * The revision of the configuration to use. This field isn't visible in this preview release.
      * </p>
      */
     private Long configurationRevision;
@@ -49,11 +51,15 @@ public class BrokerSoftwareInfo implements Serializable, Cloneable, StructuredPo
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     * The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this
+     * preview release.
      * </p>
      * 
      * @param configurationArn
-     *        The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this
+     *        preview release.
+     *        </p>
      */
 
     public void setConfigurationArn(String configurationArn) {
@@ -62,10 +68,14 @@ public void setConfigurationArn(String configurationArn) {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     * The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this
+     * preview release.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in
+     *         this preview release.
+     *         </p>
      */
 
     public String getConfigurationArn() {
@@ -74,11 +84,15 @@ public String getConfigurationArn() {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     * The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this
+     * preview release.
      * </p>
      * 
      * @param configurationArn
-     *        The Amazon Resource Name (ARN) of the configuration used for the cluster.
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this
+     *        preview release.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -89,11 +103,13 @@ public BrokerSoftwareInfo withConfigurationArn(String configurationArn) {
 
     /**
      * <p>
-     * The revision of the configuration to use.
+     * The revision of the configuration to use. This field isn't visible in this preview release.
      * </p>
      * 
      * @param configurationRevision
-     *        The revision of the configuration to use.
+     *        <p>
+     *        The revision of the configuration to use. This field isn't visible in this preview release.
+     *        </p>
      */
 
     public void setConfigurationRevision(Long configurationRevision) {
@@ -102,10 +118,12 @@ public void setConfigurationRevision(Long configurationRevision) {
 
     /**
      * <p>
-     * The revision of the configuration to use.
+     * The revision of the configuration to use. This field isn't visible in this preview release.
      * </p>
      * 
-     * @return The revision of the configuration to use.
+     * @return <p>
+     *         The revision of the configuration to use. This field isn't visible in this preview release.
+     *         </p>
      */
 
     public Long getConfigurationRevision() {
@@ -114,11 +132,13 @@ public Long getConfigurationRevision() {
 
     /**
      * <p>
-     * The revision of the configuration to use.
+     * The revision of the configuration to use. This field isn't visible in this preview release.
      * </p>
      * 
      * @param configurationRevision
-     *        The revision of the configuration to use.
+     *        <p>
+     *        The revision of the configuration to use. This field isn't visible in this preview release.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -133,7 +153,9 @@ public BrokerSoftwareInfo withConfigurationRevision(Long configurationRevision)
      * </p>
      * 
      * @param kafkaVersion
+     *        <p>
      *        The version of Apache Kafka.
+     *        </p>
      */
 
     public void setKafkaVersion(String kafkaVersion) {
@@ -145,7 +167,9 @@ public void setKafkaVersion(String kafkaVersion) {
      * The version of Apache Kafka.
      * </p>
      * 
-     * @return The version of Apache Kafka.
+     * @return <p>
+     *         The version of Apache Kafka.
+     *         </p>
      */
 
     public String getKafkaVersion() {
@@ -158,7 +182,9 @@ public String getKafkaVersion() {
      * </p>
      * 
      * @param kafkaVersion
+     *        <p>
      *        The version of Apache Kafka.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClientAuthentication.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClientAuthentication.java
new file mode 100644
index 000000000000..33d1a82fa87e
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClientAuthentication.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * Includes all client authentication information.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ClientAuthentication" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ClientAuthentication implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Details for ClientAuthentication using TLS.
+     * </p>
+     */
+    private Tls tls;
+
+    /**
+     * <p>
+     * Details for ClientAuthentication using TLS.
+     * </p>
+     * 
+     * @param tls
+     *        <p>
+     *        Details for ClientAuthentication using TLS.
+     *        </p>
+     */
+
+    public void setTls(Tls tls) {
+        this.tls = tls;
+    }
+
+    /**
+     * <p>
+     * Details for ClientAuthentication using TLS.
+     * </p>
+     * 
+     * @return <p>
+     *         Details for ClientAuthentication using TLS.
+     *         </p>
+     */
+
+    public Tls getTls() {
+        return this.tls;
+    }
+
+    /**
+     * <p>
+     * Details for ClientAuthentication using TLS.
+     * </p>
+     * 
+     * @param tls
+     *        <p>
+     *        Details for ClientAuthentication using TLS.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClientAuthentication withTls(Tls tls) {
+        setTls(tls);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTls() != null)
+            sb.append("Tls: ").append(getTls());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ClientAuthentication == false)
+            return false;
+        ClientAuthentication other = (ClientAuthentication) obj;
+        if (other.getTls() == null ^ this.getTls() == null)
+            return false;
+        if (other.getTls() != null && other.getTls().equals(this.getTls()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTls() == null) ? 0 : getTls().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ClientAuthentication clone() {
+        try {
+            return (ClientAuthentication) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.ClientAuthenticationMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClientBroker.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClientBroker.java
new file mode 100644
index 000000000000..e2eb7e123ad0
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClientBroker.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ <p>
+ * Client-broker encryption in transit setting.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum ClientBroker {
+
+    TLS("TLS"),
+    TLS_PLAINTEXT("TLS_PLAINTEXT"),
+    PLAINTEXT("PLAINTEXT");
+
+    private String value;
+
+    private ClientBroker(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return ClientBroker corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static ClientBroker fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (ClientBroker enumEntry : ClientBroker.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterInfo.java
index 340843d6394e..c2daa4c0a592 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about a cluster.
  * </p>
  * 
@@ -28,12 +29,24 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ClusterInfo implements Serializable, Cloneable, StructuredPojo {
 
+    /**
+     * <p>
+     * Arn of active cluster operation.
+     * </p>
+     */
+    private String activeOperationArn;
     /**
      * <p>
      * Information about the broker nodes.
      * </p>
      */
     private BrokerNodeGroupInfo brokerNodeGroupInfo;
+    /**
+     * <p>
+     * Includes all client authentication information.
+     * </p>
+     */
+    private ClientAuthentication clientAuthentication;
     /**
      * <p>
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
@@ -73,13 +86,14 @@ public class ClusterInfo implements Serializable, Cloneable, StructuredPojo {
     /**
      * <p>
      * Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT,
-     * PER_BROKER, and PER_TOPIC_PER_BROKER.
+     * PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of
+     * monitoring, see <a href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
      * </p>
      */
     private String enhancedMonitoring;
     /**
      * <p>
-     * The number of Kafka broker nodes in the cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      */
     private Integer numberOfBrokerNodes;
@@ -89,6 +103,12 @@ public class ClusterInfo implements Serializable, Cloneable, StructuredPojo {
      * </p>
      */
     private String state;
+    /**
+     * <p>
+     * Tags attached to the cluster.
+     * </p>
+     */
+    private java.util.Map<String, String> tags;
     /**
      * <p>
      * The connection string to use to connect to the Apache ZooKeeper cluster.
@@ -96,13 +116,61 @@ public class ClusterInfo implements Serializable, Cloneable, StructuredPojo {
      */
     private String zookeeperConnectString;
 
+    /**
+     * <p>
+     * Arn of active cluster operation.
+     * </p>
+     * 
+     * @param activeOperationArn
+     *        <p>
+     *        Arn of active cluster operation.
+     *        </p>
+     */
+
+    public void setActiveOperationArn(String activeOperationArn) {
+        this.activeOperationArn = activeOperationArn;
+    }
+
+    /**
+     * <p>
+     * Arn of active cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         Arn of active cluster operation.
+     *         </p>
+     */
+
+    public String getActiveOperationArn() {
+        return this.activeOperationArn;
+    }
+
+    /**
+     * <p>
+     * Arn of active cluster operation.
+     * </p>
+     * 
+     * @param activeOperationArn
+     *        <p>
+     *        Arn of active cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterInfo withActiveOperationArn(String activeOperationArn) {
+        setActiveOperationArn(activeOperationArn);
+        return this;
+    }
+
     /**
      * <p>
      * Information about the broker nodes.
      * </p>
      * 
      * @param brokerNodeGroupInfo
+     *        <p>
      *        Information about the broker nodes.
+     *        </p>
      */
 
     public void setBrokerNodeGroupInfo(BrokerNodeGroupInfo brokerNodeGroupInfo) {
@@ -114,7 +182,9 @@ public void setBrokerNodeGroupInfo(BrokerNodeGroupInfo brokerNodeGroupInfo) {
      * Information about the broker nodes.
      * </p>
      * 
-     * @return Information about the broker nodes.
+     * @return <p>
+     *         Information about the broker nodes.
+     *         </p>
      */
 
     public BrokerNodeGroupInfo getBrokerNodeGroupInfo() {
@@ -127,7 +197,9 @@ public BrokerNodeGroupInfo getBrokerNodeGroupInfo() {
      * </p>
      * 
      * @param brokerNodeGroupInfo
+     *        <p>
      *        Information about the broker nodes.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -136,13 +208,61 @@ public ClusterInfo withBrokerNodeGroupInfo(BrokerNodeGroupInfo brokerNodeGroupIn
         return this;
     }
 
+    /**
+     * <p>
+     * Includes all client authentication information.
+     * </p>
+     * 
+     * @param clientAuthentication
+     *        <p>
+     *        Includes all client authentication information.
+     *        </p>
+     */
+
+    public void setClientAuthentication(ClientAuthentication clientAuthentication) {
+        this.clientAuthentication = clientAuthentication;
+    }
+
+    /**
+     * <p>
+     * Includes all client authentication information.
+     * </p>
+     * 
+     * @return <p>
+     *         Includes all client authentication information.
+     *         </p>
+     */
+
+    public ClientAuthentication getClientAuthentication() {
+        return this.clientAuthentication;
+    }
+
+    /**
+     * <p>
+     * Includes all client authentication information.
+     * </p>
+     * 
+     * @param clientAuthentication
+     *        <p>
+     *        Includes all client authentication information.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterInfo withClientAuthentication(ClientAuthentication clientAuthentication) {
+        setClientAuthentication(clientAuthentication);
+        return this;
+    }
+
     /**
      * <p>
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -154,7 +274,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -167,7 +289,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -182,7 +306,9 @@ public ClusterInfo withClusterArn(String clusterArn) {
      * </p>
      * 
      * @param clusterName
+     *        <p>
      *        The name of the cluster.
+     *        </p>
      */
 
     public void setClusterName(String clusterName) {
@@ -194,7 +320,9 @@ public void setClusterName(String clusterName) {
      * The name of the cluster.
      * </p>
      * 
-     * @return The name of the cluster.
+     * @return <p>
+     *         The name of the cluster.
+     *         </p>
      */
 
     public String getClusterName() {
@@ -207,7 +335,9 @@ public String getClusterName() {
      * </p>
      * 
      * @param clusterName
+     *        <p>
      *        The name of the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -222,7 +352,9 @@ public ClusterInfo withClusterName(String clusterName) {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the cluster was created.
+     *        </p>
      */
 
     public void setCreationTime(java.util.Date creationTime) {
@@ -234,7 +366,9 @@ public void setCreationTime(java.util.Date creationTime) {
      * The time when the cluster was created.
      * </p>
      * 
-     * @return The time when the cluster was created.
+     * @return <p>
+     *         The time when the cluster was created.
+     *         </p>
      */
 
     public java.util.Date getCreationTime() {
@@ -247,7 +381,9 @@ public java.util.Date getCreationTime() {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the cluster was created.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -262,7 +398,9 @@ public ClusterInfo withCreationTime(java.util.Date creationTime) {
      * </p>
      * 
      * @param currentBrokerSoftwareInfo
+     *        <p>
      *        Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     *        </p>
      */
 
     public void setCurrentBrokerSoftwareInfo(BrokerSoftwareInfo currentBrokerSoftwareInfo) {
@@ -274,7 +412,9 @@ public void setCurrentBrokerSoftwareInfo(BrokerSoftwareInfo currentBrokerSoftwar
      * Information about the version of software currently deployed on the Kafka brokers in the cluster.
      * </p>
      * 
-     * @return Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     * @return <p>
+     *         Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     *         </p>
      */
 
     public BrokerSoftwareInfo getCurrentBrokerSoftwareInfo() {
@@ -287,7 +427,9 @@ public BrokerSoftwareInfo getCurrentBrokerSoftwareInfo() {
      * </p>
      * 
      * @param currentBrokerSoftwareInfo
+     *        <p>
      *        Information about the version of software currently deployed on the Kafka brokers in the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -302,7 +444,9 @@ public ClusterInfo withCurrentBrokerSoftwareInfo(BrokerSoftwareInfo currentBroke
      * </p>
      * 
      * @param currentVersion
+     *        <p>
      *        The current version of the MSK cluster.
+     *        </p>
      */
 
     public void setCurrentVersion(String currentVersion) {
@@ -314,7 +458,9 @@ public void setCurrentVersion(String currentVersion) {
      * The current version of the MSK cluster.
      * </p>
      * 
-     * @return The current version of the MSK cluster.
+     * @return <p>
+     *         The current version of the MSK cluster.
+     *         </p>
      */
 
     public String getCurrentVersion() {
@@ -327,7 +473,9 @@ public String getCurrentVersion() {
      * </p>
      * 
      * @param currentVersion
+     *        <p>
      *        The current version of the MSK cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -342,7 +490,9 @@ public ClusterInfo withCurrentVersion(String currentVersion) {
      * </p>
      * 
      * @param encryptionInfo
+     *        <p>
      *        Includes all encryption-related information.
+     *        </p>
      */
 
     public void setEncryptionInfo(EncryptionInfo encryptionInfo) {
@@ -354,7 +504,9 @@ public void setEncryptionInfo(EncryptionInfo encryptionInfo) {
      * Includes all encryption-related information.
      * </p>
      * 
-     * @return Includes all encryption-related information.
+     * @return <p>
+     *         Includes all encryption-related information.
+     *         </p>
      */
 
     public EncryptionInfo getEncryptionInfo() {
@@ -367,7 +519,9 @@ public EncryptionInfo getEncryptionInfo() {
      * </p>
      * 
      * @param encryptionInfo
+     *        <p>
      *        Includes all encryption-related information.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -379,12 +533,17 @@ public ClusterInfo withEncryptionInfo(EncryptionInfo encryptionInfo) {
     /**
      * <p>
      * Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT,
-     * PER_BROKER, and PER_TOPIC_PER_BROKER.
+     * PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of
+     * monitoring, see <a href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
      * </p>
      * 
      * @param enhancedMonitoring
+     *        <p>
      *        Specifies which metrics are gathered for the MSK cluster. This property has three possible values:
-     *        DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.
+     *        DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these
+     *        three levels of monitoring, see <a
+     *        href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
+     *        </p>
      * @see EnhancedMonitoring
      */
 
@@ -395,11 +554,16 @@ public void setEnhancedMonitoring(String enhancedMonitoring) {
     /**
      * <p>
      * Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT,
-     * PER_BROKER, and PER_TOPIC_PER_BROKER.
+     * PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of
+     * monitoring, see <a href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
      * </p>
      * 
-     * @return Specifies which metrics are gathered for the MSK cluster. This property has three possible values:
-     *         DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.
+     * @return <p>
+     *         Specifies which metrics are gathered for the MSK cluster. This property has three possible values:
+     *         DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these
+     *         three levels of monitoring, see <a
+     *         href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
+     *         </p>
      * @see EnhancedMonitoring
      */
 
@@ -410,12 +574,17 @@ public String getEnhancedMonitoring() {
     /**
      * <p>
      * Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT,
-     * PER_BROKER, and PER_TOPIC_PER_BROKER.
+     * PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of
+     * monitoring, see <a href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
      * </p>
      * 
      * @param enhancedMonitoring
+     *        <p>
      *        Specifies which metrics are gathered for the MSK cluster. This property has three possible values:
-     *        DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.
+     *        DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these
+     *        three levels of monitoring, see <a
+     *        href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see EnhancedMonitoring
      */
@@ -428,12 +597,17 @@ public ClusterInfo withEnhancedMonitoring(String enhancedMonitoring) {
     /**
      * <p>
      * Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT,
-     * PER_BROKER, and PER_TOPIC_PER_BROKER.
+     * PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of
+     * monitoring, see <a href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
      * </p>
      * 
      * @param enhancedMonitoring
+     *        <p>
      *        Specifies which metrics are gathered for the MSK cluster. This property has three possible values:
-     *        DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.
+     *        DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these
+     *        three levels of monitoring, see <a
+     *        href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see EnhancedMonitoring
      */
@@ -445,11 +619,13 @@ public ClusterInfo withEnhancedMonitoring(EnhancedMonitoring enhancedMonitoring)
 
     /**
      * <p>
-     * The number of Kafka broker nodes in the cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      * 
      * @param numberOfBrokerNodes
-     *        The number of Kafka broker nodes in the cluster.
+     *        <p>
+     *        The number of broker nodes in the cluster.
+     *        </p>
      */
 
     public void setNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
@@ -458,10 +634,12 @@ public void setNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
 
     /**
      * <p>
-     * The number of Kafka broker nodes in the cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      * 
-     * @return The number of Kafka broker nodes in the cluster.
+     * @return <p>
+     *         The number of broker nodes in the cluster.
+     *         </p>
      */
 
     public Integer getNumberOfBrokerNodes() {
@@ -470,11 +648,13 @@ public Integer getNumberOfBrokerNodes() {
 
     /**
      * <p>
-     * The number of Kafka broker nodes in the cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      * 
      * @param numberOfBrokerNodes
-     *        The number of Kafka broker nodes in the cluster.
+     *        <p>
+     *        The number of broker nodes in the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -489,7 +669,9 @@ public ClusterInfo withNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @see ClusterState
      */
 
@@ -502,7 +684,9 @@ public void setState(String state) {
      * The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
      * </p>
      * 
-     * @return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     * @return <p>
+     *         The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *         </p>
      * @see ClusterState
      */
 
@@ -516,7 +700,9 @@ public String getState() {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see ClusterState
      */
@@ -532,7 +718,9 @@ public ClusterInfo withState(String state) {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see ClusterState
      */
@@ -542,13 +730,82 @@ public ClusterInfo withState(ClusterState state) {
         return this;
     }
 
+    /**
+     * <p>
+     * Tags attached to the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         Tags attached to the cluster.
+     *         </p>
+     */
+
+    public java.util.Map<String, String> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * Tags attached to the cluster.
+     * </p>
+     * 
+     * @param tags
+     *        <p>
+     *        Tags attached to the cluster.
+     *        </p>
+     */
+
+    public void setTags(java.util.Map<String, String> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * <p>
+     * Tags attached to the cluster.
+     * </p>
+     * 
+     * @param tags
+     *        <p>
+     *        Tags attached to the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterInfo withTags(java.util.Map<String, String> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    public ClusterInfo addTagsEntry(String key, String value) {
+        if (null == this.tags) {
+            this.tags = new java.util.HashMap<String, String>();
+        }
+        if (this.tags.containsKey(key))
+            throw new IllegalArgumentException("Duplicated keys (" + key.toString() + ") are provided.");
+        this.tags.put(key, value);
+        return this;
+    }
+
+    /**
+     * Removes all the entries added into Tags.
+     *
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterInfo clearTagsEntries() {
+        this.tags = null;
+        return this;
+    }
+
     /**
      * <p>
      * The connection string to use to connect to the Apache ZooKeeper cluster.
      * </p>
      * 
      * @param zookeeperConnectString
+     *        <p>
      *        The connection string to use to connect to the Apache ZooKeeper cluster.
+     *        </p>
      */
 
     public void setZookeeperConnectString(String zookeeperConnectString) {
@@ -560,7 +817,9 @@ public void setZookeeperConnectString(String zookeeperConnectString) {
      * The connection string to use to connect to the Apache ZooKeeper cluster.
      * </p>
      * 
-     * @return The connection string to use to connect to the Apache ZooKeeper cluster.
+     * @return <p>
+     *         The connection string to use to connect to the Apache ZooKeeper cluster.
+     *         </p>
      */
 
     public String getZookeeperConnectString() {
@@ -573,7 +832,9 @@ public String getZookeeperConnectString() {
      * </p>
      * 
      * @param zookeeperConnectString
+     *        <p>
      *        The connection string to use to connect to the Apache ZooKeeper cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -594,8 +855,12 @@ public ClusterInfo withZookeeperConnectString(String zookeeperConnectString) {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("{");
+        if (getActiveOperationArn() != null)
+            sb.append("ActiveOperationArn: ").append(getActiveOperationArn()).append(",");
         if (getBrokerNodeGroupInfo() != null)
             sb.append("BrokerNodeGroupInfo: ").append(getBrokerNodeGroupInfo()).append(",");
+        if (getClientAuthentication() != null)
+            sb.append("ClientAuthentication: ").append(getClientAuthentication()).append(",");
         if (getClusterArn() != null)
             sb.append("ClusterArn: ").append(getClusterArn()).append(",");
         if (getClusterName() != null)
@@ -614,6 +879,8 @@ public String toString() {
             sb.append("NumberOfBrokerNodes: ").append(getNumberOfBrokerNodes()).append(",");
         if (getState() != null)
             sb.append("State: ").append(getState()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags()).append(",");
         if (getZookeeperConnectString() != null)
             sb.append("ZookeeperConnectString: ").append(getZookeeperConnectString());
         sb.append("}");
@@ -630,10 +897,18 @@ public boolean equals(Object obj) {
         if (obj instanceof ClusterInfo == false)
             return false;
         ClusterInfo other = (ClusterInfo) obj;
+        if (other.getActiveOperationArn() == null ^ this.getActiveOperationArn() == null)
+            return false;
+        if (other.getActiveOperationArn() != null && other.getActiveOperationArn().equals(this.getActiveOperationArn()) == false)
+            return false;
         if (other.getBrokerNodeGroupInfo() == null ^ this.getBrokerNodeGroupInfo() == null)
             return false;
         if (other.getBrokerNodeGroupInfo() != null && other.getBrokerNodeGroupInfo().equals(this.getBrokerNodeGroupInfo()) == false)
             return false;
+        if (other.getClientAuthentication() == null ^ this.getClientAuthentication() == null)
+            return false;
+        if (other.getClientAuthentication() != null && other.getClientAuthentication().equals(this.getClientAuthentication()) == false)
+            return false;
         if (other.getClusterArn() == null ^ this.getClusterArn() == null)
             return false;
         if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
@@ -670,6 +945,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getState() != null && other.getState().equals(this.getState()) == false)
             return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
         if (other.getZookeeperConnectString() == null ^ this.getZookeeperConnectString() == null)
             return false;
         if (other.getZookeeperConnectString() != null && other.getZookeeperConnectString().equals(this.getZookeeperConnectString()) == false)
@@ -682,7 +961,9 @@ public int hashCode() {
         final int prime = 31;
         int hashCode = 1;
 
+        hashCode = prime * hashCode + ((getActiveOperationArn() == null) ? 0 : getActiveOperationArn().hashCode());
         hashCode = prime * hashCode + ((getBrokerNodeGroupInfo() == null) ? 0 : getBrokerNodeGroupInfo().hashCode());
+        hashCode = prime * hashCode + ((getClientAuthentication() == null) ? 0 : getClientAuthentication().hashCode());
         hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
         hashCode = prime * hashCode + ((getClusterName() == null) ? 0 : getClusterName().hashCode());
         hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
@@ -692,6 +973,7 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getEnhancedMonitoring() == null) ? 0 : getEnhancedMonitoring().hashCode());
         hashCode = prime * hashCode + ((getNumberOfBrokerNodes() == null) ? 0 : getNumberOfBrokerNodes().hashCode());
         hashCode = prime * hashCode + ((getState() == null) ? 0 : getState().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
         hashCode = prime * hashCode + ((getZookeeperConnectString() == null) ? 0 : getZookeeperConnectString().hashCode());
         return hashCode;
     }
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterOperationInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterOperationInfo.java
new file mode 100644
index 000000000000..888b550d8f9d
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterOperationInfo.java
@@ -0,0 +1,674 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * Returns information about a cluster operation.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ClusterOperationInfo" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ClusterOperationInfo implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The ID of the API request that triggered this operation.
+     * </p>
+     */
+    private String clientRequestId;
+    /**
+     * <p>
+     * ARN of the cluster.
+     * </p>
+     */
+    private String clusterArn;
+    /**
+     * <p>
+     * The time that the operation was created.
+     * </p>
+     */
+    private java.util.Date creationTime;
+    /**
+     * <p>
+     * The time at which the operation finished.
+     * </p>
+     */
+    private java.util.Date endTime;
+    /**
+     * <p>
+     * Describes the error if the operation fails.
+     * </p>
+     */
+    private ErrorInfo errorInfo;
+    /**
+     * <p>
+     * ARN of the cluster operation.
+     * </p>
+     */
+    private String operationArn;
+    /**
+     * <p>
+     * State of the cluster operation.
+     * </p>
+     */
+    private String operationState;
+    /**
+     * <p>
+     * Type of the cluster operation.
+     * </p>
+     */
+    private String operationType;
+    /**
+     * <p>
+     * Information about cluster attributes before a cluster is updated.
+     * </p>
+     */
+    private MutableClusterInfo sourceClusterInfo;
+    /**
+     * <p>
+     * Information about cluster attributes after a cluster is updated.
+     * </p>
+     */
+    private MutableClusterInfo targetClusterInfo;
+
+    /**
+     * <p>
+     * The ID of the API request that triggered this operation.
+     * </p>
+     * 
+     * @param clientRequestId
+     *        <p>
+     *        The ID of the API request that triggered this operation.
+     *        </p>
+     */
+
+    public void setClientRequestId(String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+    }
+
+    /**
+     * <p>
+     * The ID of the API request that triggered this operation.
+     * </p>
+     * 
+     * @return <p>
+     *         The ID of the API request that triggered this operation.
+     *         </p>
+     */
+
+    public String getClientRequestId() {
+        return this.clientRequestId;
+    }
+
+    /**
+     * <p>
+     * The ID of the API request that triggered this operation.
+     * </p>
+     * 
+     * @param clientRequestId
+     *        <p>
+     *        The ID of the API request that triggered this operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withClientRequestId(String clientRequestId) {
+        setClientRequestId(clientRequestId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * ARN of the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        ARN of the cluster.
+     *        </p>
+     */
+
+    public void setClusterArn(String clusterArn) {
+        this.clusterArn = clusterArn;
+    }
+
+    /**
+     * <p>
+     * ARN of the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         ARN of the cluster.
+     *         </p>
+     */
+
+    public String getClusterArn() {
+        return this.clusterArn;
+    }
+
+    /**
+     * <p>
+     * ARN of the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        ARN of the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withClusterArn(String clusterArn) {
+        setClusterArn(clusterArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time that the operation was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        <p>
+     *        The time that the operation was created.
+     *        </p>
+     */
+
+    public void setCreationTime(java.util.Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    /**
+     * <p>
+     * The time that the operation was created.
+     * </p>
+     * 
+     * @return <p>
+     *         The time that the operation was created.
+     *         </p>
+     */
+
+    public java.util.Date getCreationTime() {
+        return this.creationTime;
+    }
+
+    /**
+     * <p>
+     * The time that the operation was created.
+     * </p>
+     * 
+     * @param creationTime
+     *        <p>
+     *        The time that the operation was created.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withCreationTime(java.util.Date creationTime) {
+        setCreationTime(creationTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The time at which the operation finished.
+     * </p>
+     * 
+     * @param endTime
+     *        <p>
+     *        The time at which the operation finished.
+     *        </p>
+     */
+
+    public void setEndTime(java.util.Date endTime) {
+        this.endTime = endTime;
+    }
+
+    /**
+     * <p>
+     * The time at which the operation finished.
+     * </p>
+     * 
+     * @return <p>
+     *         The time at which the operation finished.
+     *         </p>
+     */
+
+    public java.util.Date getEndTime() {
+        return this.endTime;
+    }
+
+    /**
+     * <p>
+     * The time at which the operation finished.
+     * </p>
+     * 
+     * @param endTime
+     *        <p>
+     *        The time at which the operation finished.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withEndTime(java.util.Date endTime) {
+        setEndTime(endTime);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Describes the error if the operation fails.
+     * </p>
+     * 
+     * @param errorInfo
+     *        <p>
+     *        Describes the error if the operation fails.
+     *        </p>
+     */
+
+    public void setErrorInfo(ErrorInfo errorInfo) {
+        this.errorInfo = errorInfo;
+    }
+
+    /**
+     * <p>
+     * Describes the error if the operation fails.
+     * </p>
+     * 
+     * @return <p>
+     *         Describes the error if the operation fails.
+     *         </p>
+     */
+
+    public ErrorInfo getErrorInfo() {
+        return this.errorInfo;
+    }
+
+    /**
+     * <p>
+     * Describes the error if the operation fails.
+     * </p>
+     * 
+     * @param errorInfo
+     *        <p>
+     *        Describes the error if the operation fails.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withErrorInfo(ErrorInfo errorInfo) {
+        setErrorInfo(errorInfo);
+        return this;
+    }
+
+    /**
+     * <p>
+     * ARN of the cluster operation.
+     * </p>
+     * 
+     * @param operationArn
+     *        <p>
+     *        ARN of the cluster operation.
+     *        </p>
+     */
+
+    public void setOperationArn(String operationArn) {
+        this.operationArn = operationArn;
+    }
+
+    /**
+     * <p>
+     * ARN of the cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         ARN of the cluster operation.
+     *         </p>
+     */
+
+    public String getOperationArn() {
+        return this.operationArn;
+    }
+
+    /**
+     * <p>
+     * ARN of the cluster operation.
+     * </p>
+     * 
+     * @param operationArn
+     *        <p>
+     *        ARN of the cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withOperationArn(String operationArn) {
+        setOperationArn(operationArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * State of the cluster operation.
+     * </p>
+     * 
+     * @param operationState
+     *        <p>
+     *        State of the cluster operation.
+     *        </p>
+     */
+
+    public void setOperationState(String operationState) {
+        this.operationState = operationState;
+    }
+
+    /**
+     * <p>
+     * State of the cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         State of the cluster operation.
+     *         </p>
+     */
+
+    public String getOperationState() {
+        return this.operationState;
+    }
+
+    /**
+     * <p>
+     * State of the cluster operation.
+     * </p>
+     * 
+     * @param operationState
+     *        <p>
+     *        State of the cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withOperationState(String operationState) {
+        setOperationState(operationState);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Type of the cluster operation.
+     * </p>
+     * 
+     * @param operationType
+     *        <p>
+     *        Type of the cluster operation.
+     *        </p>
+     */
+
+    public void setOperationType(String operationType) {
+        this.operationType = operationType;
+    }
+
+    /**
+     * <p>
+     * Type of the cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         Type of the cluster operation.
+     *         </p>
+     */
+
+    public String getOperationType() {
+        return this.operationType;
+    }
+
+    /**
+     * <p>
+     * Type of the cluster operation.
+     * </p>
+     * 
+     * @param operationType
+     *        <p>
+     *        Type of the cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withOperationType(String operationType) {
+        setOperationType(operationType);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information about cluster attributes before a cluster is updated.
+     * </p>
+     * 
+     * @param sourceClusterInfo
+     *        <p>
+     *        Information about cluster attributes before a cluster is updated.
+     *        </p>
+     */
+
+    public void setSourceClusterInfo(MutableClusterInfo sourceClusterInfo) {
+        this.sourceClusterInfo = sourceClusterInfo;
+    }
+
+    /**
+     * <p>
+     * Information about cluster attributes before a cluster is updated.
+     * </p>
+     * 
+     * @return <p>
+     *         Information about cluster attributes before a cluster is updated.
+     *         </p>
+     */
+
+    public MutableClusterInfo getSourceClusterInfo() {
+        return this.sourceClusterInfo;
+    }
+
+    /**
+     * <p>
+     * Information about cluster attributes before a cluster is updated.
+     * </p>
+     * 
+     * @param sourceClusterInfo
+     *        <p>
+     *        Information about cluster attributes before a cluster is updated.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withSourceClusterInfo(MutableClusterInfo sourceClusterInfo) {
+        setSourceClusterInfo(sourceClusterInfo);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information about cluster attributes after a cluster is updated.
+     * </p>
+     * 
+     * @param targetClusterInfo
+     *        <p>
+     *        Information about cluster attributes after a cluster is updated.
+     *        </p>
+     */
+
+    public void setTargetClusterInfo(MutableClusterInfo targetClusterInfo) {
+        this.targetClusterInfo = targetClusterInfo;
+    }
+
+    /**
+     * <p>
+     * Information about cluster attributes after a cluster is updated.
+     * </p>
+     * 
+     * @return <p>
+     *         Information about cluster attributes after a cluster is updated.
+     *         </p>
+     */
+
+    public MutableClusterInfo getTargetClusterInfo() {
+        return this.targetClusterInfo;
+    }
+
+    /**
+     * <p>
+     * Information about cluster attributes after a cluster is updated.
+     * </p>
+     * 
+     * @param targetClusterInfo
+     *        <p>
+     *        Information about cluster attributes after a cluster is updated.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ClusterOperationInfo withTargetClusterInfo(MutableClusterInfo targetClusterInfo) {
+        setTargetClusterInfo(targetClusterInfo);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClientRequestId() != null)
+            sb.append("ClientRequestId: ").append(getClientRequestId()).append(",");
+        if (getClusterArn() != null)
+            sb.append("ClusterArn: ").append(getClusterArn()).append(",");
+        if (getCreationTime() != null)
+            sb.append("CreationTime: ").append(getCreationTime()).append(",");
+        if (getEndTime() != null)
+            sb.append("EndTime: ").append(getEndTime()).append(",");
+        if (getErrorInfo() != null)
+            sb.append("ErrorInfo: ").append(getErrorInfo()).append(",");
+        if (getOperationArn() != null)
+            sb.append("OperationArn: ").append(getOperationArn()).append(",");
+        if (getOperationState() != null)
+            sb.append("OperationState: ").append(getOperationState()).append(",");
+        if (getOperationType() != null)
+            sb.append("OperationType: ").append(getOperationType()).append(",");
+        if (getSourceClusterInfo() != null)
+            sb.append("SourceClusterInfo: ").append(getSourceClusterInfo()).append(",");
+        if (getTargetClusterInfo() != null)
+            sb.append("TargetClusterInfo: ").append(getTargetClusterInfo());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ClusterOperationInfo == false)
+            return false;
+        ClusterOperationInfo other = (ClusterOperationInfo) obj;
+        if (other.getClientRequestId() == null ^ this.getClientRequestId() == null)
+            return false;
+        if (other.getClientRequestId() != null && other.getClientRequestId().equals(this.getClientRequestId()) == false)
+            return false;
+        if (other.getClusterArn() == null ^ this.getClusterArn() == null)
+            return false;
+        if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
+            return false;
+        if (other.getCreationTime() == null ^ this.getCreationTime() == null)
+            return false;
+        if (other.getCreationTime() != null && other.getCreationTime().equals(this.getCreationTime()) == false)
+            return false;
+        if (other.getEndTime() == null ^ this.getEndTime() == null)
+            return false;
+        if (other.getEndTime() != null && other.getEndTime().equals(this.getEndTime()) == false)
+            return false;
+        if (other.getErrorInfo() == null ^ this.getErrorInfo() == null)
+            return false;
+        if (other.getErrorInfo() != null && other.getErrorInfo().equals(this.getErrorInfo()) == false)
+            return false;
+        if (other.getOperationArn() == null ^ this.getOperationArn() == null)
+            return false;
+        if (other.getOperationArn() != null && other.getOperationArn().equals(this.getOperationArn()) == false)
+            return false;
+        if (other.getOperationState() == null ^ this.getOperationState() == null)
+            return false;
+        if (other.getOperationState() != null && other.getOperationState().equals(this.getOperationState()) == false)
+            return false;
+        if (other.getOperationType() == null ^ this.getOperationType() == null)
+            return false;
+        if (other.getOperationType() != null && other.getOperationType().equals(this.getOperationType()) == false)
+            return false;
+        if (other.getSourceClusterInfo() == null ^ this.getSourceClusterInfo() == null)
+            return false;
+        if (other.getSourceClusterInfo() != null && other.getSourceClusterInfo().equals(this.getSourceClusterInfo()) == false)
+            return false;
+        if (other.getTargetClusterInfo() == null ^ this.getTargetClusterInfo() == null)
+            return false;
+        if (other.getTargetClusterInfo() != null && other.getTargetClusterInfo().equals(this.getTargetClusterInfo()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClientRequestId() == null) ? 0 : getClientRequestId().hashCode());
+        hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
+        hashCode = prime * hashCode + ((getCreationTime() == null) ? 0 : getCreationTime().hashCode());
+        hashCode = prime * hashCode + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
+        hashCode = prime * hashCode + ((getErrorInfo() == null) ? 0 : getErrorInfo().hashCode());
+        hashCode = prime * hashCode + ((getOperationArn() == null) ? 0 : getOperationArn().hashCode());
+        hashCode = prime * hashCode + ((getOperationState() == null) ? 0 : getOperationState().hashCode());
+        hashCode = prime * hashCode + ((getOperationType() == null) ? 0 : getOperationType().hashCode());
+        hashCode = prime * hashCode + ((getSourceClusterInfo() == null) ? 0 : getSourceClusterInfo().hashCode());
+        hashCode = prime * hashCode + ((getTargetClusterInfo() == null) ? 0 : getTargetClusterInfo().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ClusterOperationInfo clone() {
+        try {
+            return (ClusterOperationInfo) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.ClusterOperationInfoMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterState.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterState.java
index e266869629d9..2f4061e18ec4 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterState.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ClusterState.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * The state of a Kafka cluster.
  * </p>
  */
@@ -24,6 +25,7 @@ public enum ClusterState {
 
     ACTIVE("ACTIVE"),
     CREATING("CREATING"),
+    UPDATING("UPDATING"),
     DELETING("DELETING"),
     FAILED("FAILED");
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Configuration.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Configuration.java
index f3ee13cdb8e2..e54799542ad3 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Configuration.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Configuration.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Represents an MSK Configuration.
  * </p>
  * 
@@ -73,7 +74,9 @@ public class Configuration implements Serializable, Cloneable, StructuredPojo {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -85,7 +88,9 @@ public void setArn(String arn) {
      * The Amazon Resource Name (ARN) of the configuration.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the configuration.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the configuration.
+     *         </p>
      */
 
     public String getArn() {
@@ -98,7 +103,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -113,7 +120,9 @@ public Configuration withArn(String arn) {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      */
 
     public void setCreationTime(java.util.Date creationTime) {
@@ -125,7 +134,9 @@ public void setCreationTime(java.util.Date creationTime) {
      * The time when the configuration was created.
      * </p>
      * 
-     * @return The time when the configuration was created.
+     * @return <p>
+     *         The time when the configuration was created.
+     *         </p>
      */
 
     public java.util.Date getCreationTime() {
@@ -138,7 +149,9 @@ public java.util.Date getCreationTime() {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -153,7 +166,9 @@ public Configuration withCreationTime(java.util.Date creationTime) {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      */
 
     public void setDescription(String description) {
@@ -165,7 +180,9 @@ public void setDescription(String description) {
      * The description of the configuration.
      * </p>
      * 
-     * @return The description of the configuration.
+     * @return <p>
+     *         The description of the configuration.
+     *         </p>
      */
 
     public String getDescription() {
@@ -178,7 +195,9 @@ public String getDescription() {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -194,9 +213,11 @@ public Configuration withDescription(String description) {
      * array.
      * </p>
      * 
-     * @return An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this
+     * @return <p>
+     *         An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this
      *         configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in
      *         this array.
+     *         </p>
      */
 
     public java.util.List<String> getKafkaVersions() {
@@ -211,9 +232,11 @@ public java.util.List<String> getKafkaVersions() {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this
      *        configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in
      *        this array.
+     *        </p>
      */
 
     public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
@@ -231,6 +254,7 @@ public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
      * configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this
      * array.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want
@@ -238,9 +262,11 @@ public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this
      *        configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in
      *        this array.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -262,9 +288,11 @@ public Configuration withKafkaVersions(String... kafkaVersions) {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this
      *        configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in
      *        this array.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -279,7 +307,9 @@ public Configuration withKafkaVersions(java.util.Collection<String> kafkaVersion
      * </p>
      * 
      * @param latestRevision
+     *        <p>
      *        Latest revision of the configuration.
+     *        </p>
      */
 
     public void setLatestRevision(ConfigurationRevision latestRevision) {
@@ -291,7 +321,9 @@ public void setLatestRevision(ConfigurationRevision latestRevision) {
      * Latest revision of the configuration.
      * </p>
      * 
-     * @return Latest revision of the configuration.
+     * @return <p>
+     *         Latest revision of the configuration.
+     *         </p>
      */
 
     public ConfigurationRevision getLatestRevision() {
@@ -304,7 +336,9 @@ public ConfigurationRevision getLatestRevision() {
      * </p>
      * 
      * @param latestRevision
+     *        <p>
      *        Latest revision of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -319,7 +353,9 @@ public Configuration withLatestRevision(ConfigurationRevision latestRevision) {
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      */
 
     public void setName(String name) {
@@ -331,7 +367,9 @@ public void setName(String name) {
      * The name of the configuration.
      * </p>
      * 
-     * @return The name of the configuration.
+     * @return <p>
+     *         The name of the configuration.
+     *         </p>
      */
 
     public String getName() {
@@ -344,7 +382,9 @@ public String getName() {
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationInfo.java
index c7363a55b5c1..f381aac67c11 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationInfo.java
@@ -18,8 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
- * Specifies the Kafka configuration to use for the brokers.
+ * 
+ <p>
+ * Specifies the configuration to use for the brokers.
  * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ConfigurationInfo" target="_top">AWS API
@@ -47,7 +48,9 @@ public class ConfigurationInfo implements Serializable, Cloneable, StructuredPoj
      * </p>
      * 
      * @param arn
+     *        <p>
      *        ARN of the configuration to use.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -59,7 +62,9 @@ public void setArn(String arn) {
      * ARN of the configuration to use.
      * </p>
      * 
-     * @return ARN of the configuration to use.
+     * @return <p>
+     *         ARN of the configuration to use.
+     *         </p>
      */
 
     public String getArn() {
@@ -72,7 +77,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        ARN of the configuration to use.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -87,7 +94,9 @@ public ConfigurationInfo withArn(String arn) {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        The revision of the configuration to use.
+     *        </p>
      */
 
     public void setRevision(Long revision) {
@@ -99,7 +108,9 @@ public void setRevision(Long revision) {
      * The revision of the configuration to use.
      * </p>
      * 
-     * @return The revision of the configuration to use.
+     * @return <p>
+     *         The revision of the configuration to use.
+     *         </p>
      */
 
     public Long getRevision() {
@@ -112,7 +123,9 @@ public Long getRevision() {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        The revision of the configuration to use.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationRevision.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationRevision.java
index a0c0f8a5d03b..81a01fd36444 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationRevision.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConfigurationRevision.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Describes a configuration revision.
  * </p>
  * 
@@ -53,7 +54,9 @@ public class ConfigurationRevision implements Serializable, Cloneable, Structure
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration revision was created.
+     *        </p>
      */
 
     public void setCreationTime(java.util.Date creationTime) {
@@ -65,7 +68,9 @@ public void setCreationTime(java.util.Date creationTime) {
      * The time when the configuration revision was created.
      * </p>
      * 
-     * @return The time when the configuration revision was created.
+     * @return <p>
+     *         The time when the configuration revision was created.
+     *         </p>
      */
 
     public java.util.Date getCreationTime() {
@@ -78,7 +83,9 @@ public java.util.Date getCreationTime() {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration revision was created.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -93,7 +100,9 @@ public ConfigurationRevision withCreationTime(java.util.Date creationTime) {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration revision.
+     *        </p>
      */
 
     public void setDescription(String description) {
@@ -105,7 +114,9 @@ public void setDescription(String description) {
      * The description of the configuration revision.
      * </p>
      * 
-     * @return The description of the configuration revision.
+     * @return <p>
+     *         The description of the configuration revision.
+     *         </p>
      */
 
     public String getDescription() {
@@ -118,7 +129,9 @@ public String getDescription() {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration revision.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -133,7 +146,9 @@ public ConfigurationRevision withDescription(String description) {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        The revision number.
+     *        </p>
      */
 
     public void setRevision(Long revision) {
@@ -145,7 +160,9 @@ public void setRevision(Long revision) {
      * The revision number.
      * </p>
      * 
-     * @return The revision number.
+     * @return <p>
+     *         The revision number.
+     *         </p>
      */
 
     public Long getRevision() {
@@ -158,7 +175,9 @@ public Long getRevision() {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        The revision number.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConflictException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConflictException.java
index 68b7a922f1f2..e0269eb7dd83 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConflictException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ConflictException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public ConflictException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterRequest.java
index 04368ab23f9a..699917057a67 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterRequest.java
@@ -31,6 +31,12 @@ public class CreateClusterRequest extends com.amazonaws.AmazonWebServiceRequest
      * </p>
      */
     private BrokerNodeGroupInfo brokerNodeGroupInfo;
+    /**
+     * <p>
+     * Includes all client authentication related information.
+     * </p>
+     */
+    private ClientAuthentication clientAuthentication;
     /**
      * <p>
      * The name of the cluster.
@@ -39,7 +45,7 @@ public class CreateClusterRequest extends com.amazonaws.AmazonWebServiceRequest
     private String clusterName;
     /**
      * <p>
-     * Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
      * </p>
      */
     private ConfigurationInfo configurationInfo;
@@ -64,10 +70,16 @@ public class CreateClusterRequest extends com.amazonaws.AmazonWebServiceRequest
     private String kafkaVersion;
     /**
      * <p>
-     * The number of Kafka broker nodes in the Amazon MSK cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      */
     private Integer numberOfBrokerNodes;
+    /**
+     * <p>
+     * Create tags when creating the cluster.
+     * </p>
+     */
+    private java.util.Map<String, String> tags;
 
     /**
      * <p>
@@ -75,7 +87,9 @@ public class CreateClusterRequest extends com.amazonaws.AmazonWebServiceRequest
      * </p>
      * 
      * @param brokerNodeGroupInfo
+     *        <p>
      *        Information about the broker nodes in the cluster.
+     *        </p>
      */
 
     public void setBrokerNodeGroupInfo(BrokerNodeGroupInfo brokerNodeGroupInfo) {
@@ -87,7 +101,9 @@ public void setBrokerNodeGroupInfo(BrokerNodeGroupInfo brokerNodeGroupInfo) {
      * Information about the broker nodes in the cluster.
      * </p>
      * 
-     * @return Information about the broker nodes in the cluster.
+     * @return <p>
+     *         Information about the broker nodes in the cluster.
+     *         </p>
      */
 
     public BrokerNodeGroupInfo getBrokerNodeGroupInfo() {
@@ -100,7 +116,9 @@ public BrokerNodeGroupInfo getBrokerNodeGroupInfo() {
      * </p>
      * 
      * @param brokerNodeGroupInfo
+     *        <p>
      *        Information about the broker nodes in the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -109,13 +127,61 @@ public CreateClusterRequest withBrokerNodeGroupInfo(BrokerNodeGroupInfo brokerNo
         return this;
     }
 
+    /**
+     * <p>
+     * Includes all client authentication related information.
+     * </p>
+     * 
+     * @param clientAuthentication
+     *        <p>
+     *        Includes all client authentication related information.
+     *        </p>
+     */
+
+    public void setClientAuthentication(ClientAuthentication clientAuthentication) {
+        this.clientAuthentication = clientAuthentication;
+    }
+
+    /**
+     * <p>
+     * Includes all client authentication related information.
+     * </p>
+     * 
+     * @return <p>
+     *         Includes all client authentication related information.
+     *         </p>
+     */
+
+    public ClientAuthentication getClientAuthentication() {
+        return this.clientAuthentication;
+    }
+
+    /**
+     * <p>
+     * Includes all client authentication related information.
+     * </p>
+     * 
+     * @param clientAuthentication
+     *        <p>
+     *        Includes all client authentication related information.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateClusterRequest withClientAuthentication(ClientAuthentication clientAuthentication) {
+        setClientAuthentication(clientAuthentication);
+        return this;
+    }
+
     /**
      * <p>
      * The name of the cluster.
      * </p>
      * 
      * @param clusterName
+     *        <p>
      *        The name of the cluster.
+     *        </p>
      */
 
     public void setClusterName(String clusterName) {
@@ -127,7 +193,9 @@ public void setClusterName(String clusterName) {
      * The name of the cluster.
      * </p>
      * 
-     * @return The name of the cluster.
+     * @return <p>
+     *         The name of the cluster.
+     *         </p>
      */
 
     public String getClusterName() {
@@ -140,7 +208,9 @@ public String getClusterName() {
      * </p>
      * 
      * @param clusterName
+     *        <p>
      *        The name of the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -151,11 +221,13 @@ public CreateClusterRequest withClusterName(String clusterName) {
 
     /**
      * <p>
-     * Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
      * </p>
      * 
      * @param configurationInfo
-     *        Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     *        <p>
+     *        Represents the configuration that you want MSK to use for the brokers in a cluster.
+     *        </p>
      */
 
     public void setConfigurationInfo(ConfigurationInfo configurationInfo) {
@@ -164,10 +236,12 @@ public void setConfigurationInfo(ConfigurationInfo configurationInfo) {
 
     /**
      * <p>
-     * Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
      * </p>
      * 
-     * @return Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     * @return <p>
+     *         Represents the configuration that you want MSK to use for the brokers in a cluster.
+     *         </p>
      */
 
     public ConfigurationInfo getConfigurationInfo() {
@@ -176,11 +250,13 @@ public ConfigurationInfo getConfigurationInfo() {
 
     /**
      * <p>
-     * Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
      * </p>
      * 
      * @param configurationInfo
-     *        Comprises of the Configuration to be used on Kafka brokers in a cluster.
+     *        <p>
+     *        Represents the configuration that you want MSK to use for the brokers in a cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -195,7 +271,9 @@ public CreateClusterRequest withConfigurationInfo(ConfigurationInfo configuratio
      * </p>
      * 
      * @param encryptionInfo
+     *        <p>
      *        Includes all encryption-related information.
+     *        </p>
      */
 
     public void setEncryptionInfo(EncryptionInfo encryptionInfo) {
@@ -207,7 +285,9 @@ public void setEncryptionInfo(EncryptionInfo encryptionInfo) {
      * Includes all encryption-related information.
      * </p>
      * 
-     * @return Includes all encryption-related information.
+     * @return <p>
+     *         Includes all encryption-related information.
+     *         </p>
      */
 
     public EncryptionInfo getEncryptionInfo() {
@@ -220,7 +300,9 @@ public EncryptionInfo getEncryptionInfo() {
      * </p>
      * 
      * @param encryptionInfo
+     *        <p>
      *        Includes all encryption-related information.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -236,8 +318,10 @@ public CreateClusterRequest withEncryptionInfo(EncryptionInfo encryptionInfo) {
      * </p>
      * 
      * @param enhancedMonitoring
+     *        <p>
      *        Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and
      *        PER_TOPIC_PER_BROKER.
+     *        </p>
      * @see EnhancedMonitoring
      */
 
@@ -251,8 +335,10 @@ public void setEnhancedMonitoring(String enhancedMonitoring) {
      * PER_TOPIC_PER_BROKER.
      * </p>
      * 
-     * @return Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and
+     * @return <p>
+     *         Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and
      *         PER_TOPIC_PER_BROKER.
+     *         </p>
      * @see EnhancedMonitoring
      */
 
@@ -267,8 +353,10 @@ public String getEnhancedMonitoring() {
      * </p>
      * 
      * @param enhancedMonitoring
+     *        <p>
      *        Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and
      *        PER_TOPIC_PER_BROKER.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see EnhancedMonitoring
      */
@@ -285,8 +373,10 @@ public CreateClusterRequest withEnhancedMonitoring(String enhancedMonitoring) {
      * </p>
      * 
      * @param enhancedMonitoring
+     *        <p>
      *        Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and
      *        PER_TOPIC_PER_BROKER.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see EnhancedMonitoring
      */
@@ -302,7 +392,9 @@ public CreateClusterRequest withEnhancedMonitoring(EnhancedMonitoring enhancedMo
      * </p>
      * 
      * @param kafkaVersion
+     *        <p>
      *        The version of Apache Kafka.
+     *        </p>
      */
 
     public void setKafkaVersion(String kafkaVersion) {
@@ -314,7 +406,9 @@ public void setKafkaVersion(String kafkaVersion) {
      * The version of Apache Kafka.
      * </p>
      * 
-     * @return The version of Apache Kafka.
+     * @return <p>
+     *         The version of Apache Kafka.
+     *         </p>
      */
 
     public String getKafkaVersion() {
@@ -327,7 +421,9 @@ public String getKafkaVersion() {
      * </p>
      * 
      * @param kafkaVersion
+     *        <p>
      *        The version of Apache Kafka.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -338,11 +434,13 @@ public CreateClusterRequest withKafkaVersion(String kafkaVersion) {
 
     /**
      * <p>
-     * The number of Kafka broker nodes in the Amazon MSK cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      * 
      * @param numberOfBrokerNodes
-     *        The number of Kafka broker nodes in the Amazon MSK cluster.
+     *        <p>
+     *        The number of broker nodes in the cluster.
+     *        </p>
      */
 
     public void setNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
@@ -351,10 +449,12 @@ public void setNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
 
     /**
      * <p>
-     * The number of Kafka broker nodes in the Amazon MSK cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      * 
-     * @return The number of Kafka broker nodes in the Amazon MSK cluster.
+     * @return <p>
+     *         The number of broker nodes in the cluster.
+     *         </p>
      */
 
     public Integer getNumberOfBrokerNodes() {
@@ -363,11 +463,13 @@ public Integer getNumberOfBrokerNodes() {
 
     /**
      * <p>
-     * The number of Kafka broker nodes in the Amazon MSK cluster.
+     * The number of broker nodes in the cluster.
      * </p>
      * 
      * @param numberOfBrokerNodes
-     *        The number of Kafka broker nodes in the Amazon MSK cluster.
+     *        <p>
+     *        The number of broker nodes in the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -376,6 +478,73 @@ public CreateClusterRequest withNumberOfBrokerNodes(Integer numberOfBrokerNodes)
         return this;
     }
 
+    /**
+     * <p>
+     * Create tags when creating the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         Create tags when creating the cluster.
+     *         </p>
+     */
+
+    public java.util.Map<String, String> getTags() {
+        return tags;
+    }
+
+    /**
+     * <p>
+     * Create tags when creating the cluster.
+     * </p>
+     * 
+     * @param tags
+     *        <p>
+     *        Create tags when creating the cluster.
+     *        </p>
+     */
+
+    public void setTags(java.util.Map<String, String> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * <p>
+     * Create tags when creating the cluster.
+     * </p>
+     * 
+     * @param tags
+     *        <p>
+     *        Create tags when creating the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateClusterRequest withTags(java.util.Map<String, String> tags) {
+        setTags(tags);
+        return this;
+    }
+
+    public CreateClusterRequest addTagsEntry(String key, String value) {
+        if (null == this.tags) {
+            this.tags = new java.util.HashMap<String, String>();
+        }
+        if (this.tags.containsKey(key))
+            throw new IllegalArgumentException("Duplicated keys (" + key.toString() + ") are provided.");
+        this.tags.put(key, value);
+        return this;
+    }
+
+    /**
+     * Removes all the entries added into Tags.
+     *
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CreateClusterRequest clearTagsEntries() {
+        this.tags = null;
+        return this;
+    }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -390,6 +559,8 @@ public String toString() {
         sb.append("{");
         if (getBrokerNodeGroupInfo() != null)
             sb.append("BrokerNodeGroupInfo: ").append(getBrokerNodeGroupInfo()).append(",");
+        if (getClientAuthentication() != null)
+            sb.append("ClientAuthentication: ").append(getClientAuthentication()).append(",");
         if (getClusterName() != null)
             sb.append("ClusterName: ").append(getClusterName()).append(",");
         if (getConfigurationInfo() != null)
@@ -401,7 +572,9 @@ public String toString() {
         if (getKafkaVersion() != null)
             sb.append("KafkaVersion: ").append(getKafkaVersion()).append(",");
         if (getNumberOfBrokerNodes() != null)
-            sb.append("NumberOfBrokerNodes: ").append(getNumberOfBrokerNodes());
+            sb.append("NumberOfBrokerNodes: ").append(getNumberOfBrokerNodes()).append(",");
+        if (getTags() != null)
+            sb.append("Tags: ").append(getTags());
         sb.append("}");
         return sb.toString();
     }
@@ -420,6 +593,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getBrokerNodeGroupInfo() != null && other.getBrokerNodeGroupInfo().equals(this.getBrokerNodeGroupInfo()) == false)
             return false;
+        if (other.getClientAuthentication() == null ^ this.getClientAuthentication() == null)
+            return false;
+        if (other.getClientAuthentication() != null && other.getClientAuthentication().equals(this.getClientAuthentication()) == false)
+            return false;
         if (other.getClusterName() == null ^ this.getClusterName() == null)
             return false;
         if (other.getClusterName() != null && other.getClusterName().equals(this.getClusterName()) == false)
@@ -444,6 +621,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getNumberOfBrokerNodes() != null && other.getNumberOfBrokerNodes().equals(this.getNumberOfBrokerNodes()) == false)
             return false;
+        if (other.getTags() == null ^ this.getTags() == null)
+            return false;
+        if (other.getTags() != null && other.getTags().equals(this.getTags()) == false)
+            return false;
         return true;
     }
 
@@ -453,12 +634,14 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getBrokerNodeGroupInfo() == null) ? 0 : getBrokerNodeGroupInfo().hashCode());
+        hashCode = prime * hashCode + ((getClientAuthentication() == null) ? 0 : getClientAuthentication().hashCode());
         hashCode = prime * hashCode + ((getClusterName() == null) ? 0 : getClusterName().hashCode());
         hashCode = prime * hashCode + ((getConfigurationInfo() == null) ? 0 : getConfigurationInfo().hashCode());
         hashCode = prime * hashCode + ((getEncryptionInfo() == null) ? 0 : getEncryptionInfo().hashCode());
         hashCode = prime * hashCode + ((getEnhancedMonitoring() == null) ? 0 : getEnhancedMonitoring().hashCode());
         hashCode = prime * hashCode + ((getKafkaVersion() == null) ? 0 : getKafkaVersion().hashCode());
         hashCode = prime * hashCode + ((getNumberOfBrokerNodes() == null) ? 0 : getNumberOfBrokerNodes().hashCode());
+        hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode());
         return hashCode;
     }
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterResult.java
index 81e2064283ee..efd359e3486d 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateClusterResult.java
@@ -48,7 +48,9 @@ public class CreateClusterResult extends com.amazonaws.AmazonWebServiceResult<co
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -60,7 +62,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) of the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -73,7 +77,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -88,7 +94,9 @@ public CreateClusterResult withClusterArn(String clusterArn) {
      * </p>
      * 
      * @param clusterName
+     *        <p>
      *        The name of the MSK cluster.
+     *        </p>
      */
 
     public void setClusterName(String clusterName) {
@@ -100,7 +108,9 @@ public void setClusterName(String clusterName) {
      * The name of the MSK cluster.
      * </p>
      * 
-     * @return The name of the MSK cluster.
+     * @return <p>
+     *         The name of the MSK cluster.
+     *         </p>
      */
 
     public String getClusterName() {
@@ -113,7 +123,9 @@ public String getClusterName() {
      * </p>
      * 
      * @param clusterName
+     *        <p>
      *        The name of the MSK cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -128,7 +140,9 @@ public CreateClusterResult withClusterName(String clusterName) {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @see ClusterState
      */
 
@@ -141,7 +155,9 @@ public void setState(String state) {
      * The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
      * </p>
      * 
-     * @return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     * @return <p>
+     *         The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *         </p>
      * @see ClusterState
      */
 
@@ -155,7 +171,9 @@ public String getState() {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see ClusterState
      */
@@ -171,7 +189,9 @@ public CreateClusterResult withState(String state) {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see ClusterState
      */
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationRequest.java
index 6ebd0024206f..b786e38a6468 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationRequest.java
@@ -45,9 +45,9 @@ public class CreateConfigurationRequest extends com.amazonaws.AmazonWebServiceRe
     private String name;
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
      */
     private java.nio.ByteBuffer serverProperties;
@@ -58,7 +58,9 @@ public class CreateConfigurationRequest extends com.amazonaws.AmazonWebServiceRe
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      */
 
     public void setDescription(String description) {
@@ -70,7 +72,9 @@ public void setDescription(String description) {
      * The description of the configuration.
      * </p>
      * 
-     * @return The description of the configuration.
+     * @return <p>
+     *         The description of the configuration.
+     *         </p>
      */
 
     public String getDescription() {
@@ -83,7 +87,9 @@ public String getDescription() {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -97,7 +103,9 @@ public CreateConfigurationRequest withDescription(String description) {
      * The versions of Apache Kafka with which you can use this MSK configuration.
      * </p>
      * 
-     * @return The versions of Apache Kafka with which you can use this MSK configuration.
+     * @return <p>
+     *         The versions of Apache Kafka with which you can use this MSK configuration.
+     *         </p>
      */
 
     public java.util.List<String> getKafkaVersions() {
@@ -110,7 +118,9 @@ public java.util.List<String> getKafkaVersions() {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        The versions of Apache Kafka with which you can use this MSK configuration.
+     *        </p>
      */
 
     public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
@@ -126,6 +136,7 @@ public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
      * <p>
      * The versions of Apache Kafka with which you can use this MSK configuration.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want
@@ -133,7 +144,9 @@ public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        The versions of Apache Kafka with which you can use this MSK configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -153,7 +166,9 @@ public CreateConfigurationRequest withKafkaVersions(String... kafkaVersions) {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        The versions of Apache Kafka with which you can use this MSK configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -168,7 +183,9 @@ public CreateConfigurationRequest withKafkaVersions(java.util.Collection<String>
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      */
 
     public void setName(String name) {
@@ -180,7 +197,9 @@ public void setName(String name) {
      * The name of the configuration.
      * </p>
      * 
-     * @return The name of the configuration.
+     * @return <p>
+     *         The name of the configuration.
+     *         </p>
      */
 
     public String getName() {
@@ -193,7 +212,9 @@ public String getName() {
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -204,9 +225,9 @@ public CreateConfigurationRequest withName(String name) {
 
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
      * <p>
      * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
@@ -220,9 +241,11 @@ public CreateConfigurationRequest withName(String name) {
      * </p>
      * 
      * @param serverProperties
-     *        Contents of the server.properties file. When using the API, you must ensure that the contents of the file
-     *        are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of
-     *        server.properties can be in plaintext.
+     *        <p>
+     *        Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     *        contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI,
+     *        the contents of <filename>server.properties</filename> can be in plaintext.
+     *        </p>
      */
 
     public void setServerProperties(java.nio.ByteBuffer serverProperties) {
@@ -231,21 +254,24 @@ public void setServerProperties(java.nio.ByteBuffer serverProperties) {
 
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
+     * 
      * <p>
      * {@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend
      * using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent
-     * {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}.
-     * Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the
+     * {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}
+     * . Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the
      * {@code position}.
      * </p>
      * 
-     * @return Contents of the server.properties file. When using the API, you must ensure that the contents of the file
-     *         are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of
-     *         server.properties can be in plaintext.
+     * @return <p>
+     *         Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     *         contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI,
+     *         the contents of <filename>server.properties</filename> can be in plaintext.
+     *         </p>
      */
 
     public java.nio.ByteBuffer getServerProperties() {
@@ -254,9 +280,9 @@ public java.nio.ByteBuffer getServerProperties() {
 
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
      * <p>
      * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
@@ -270,9 +296,11 @@ public java.nio.ByteBuffer getServerProperties() {
      * </p>
      * 
      * @param serverProperties
-     *        Contents of the server.properties file. When using the API, you must ensure that the contents of the file
-     *        are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of
-     *        server.properties can be in plaintext.
+     *        <p>
+     *        Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     *        contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI,
+     *        the contents of <filename>server.properties</filename> can be in plaintext.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationResult.java
index ccd680e37485..b0d7e6f7aea0 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/CreateConfigurationResult.java
@@ -54,7 +54,9 @@ public class CreateConfigurationResult extends com.amazonaws.AmazonWebServiceRes
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -66,7 +68,9 @@ public void setArn(String arn) {
      * The Amazon Resource Name (ARN) of the configuration.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the configuration.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the configuration.
+     *         </p>
      */
 
     public String getArn() {
@@ -79,7 +83,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -94,7 +100,9 @@ public CreateConfigurationResult withArn(String arn) {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      */
 
     public void setCreationTime(java.util.Date creationTime) {
@@ -106,7 +114,9 @@ public void setCreationTime(java.util.Date creationTime) {
      * The time when the configuration was created.
      * </p>
      * 
-     * @return The time when the configuration was created.
+     * @return <p>
+     *         The time when the configuration was created.
+     *         </p>
      */
 
     public java.util.Date getCreationTime() {
@@ -119,7 +129,9 @@ public java.util.Date getCreationTime() {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -134,7 +146,9 @@ public CreateConfigurationResult withCreationTime(java.util.Date creationTime) {
      * </p>
      * 
      * @param latestRevision
+     *        <p>
      *        Latest revision of the configuration.
+     *        </p>
      */
 
     public void setLatestRevision(ConfigurationRevision latestRevision) {
@@ -146,7 +160,9 @@ public void setLatestRevision(ConfigurationRevision latestRevision) {
      * Latest revision of the configuration.
      * </p>
      * 
-     * @return Latest revision of the configuration.
+     * @return <p>
+     *         Latest revision of the configuration.
+     *         </p>
      */
 
     public ConfigurationRevision getLatestRevision() {
@@ -159,7 +175,9 @@ public ConfigurationRevision getLatestRevision() {
      * </p>
      * 
      * @param latestRevision
+     *        <p>
      *        Latest revision of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -174,7 +192,9 @@ public CreateConfigurationResult withLatestRevision(ConfigurationRevision latest
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      */
 
     public void setName(String name) {
@@ -186,7 +206,9 @@ public void setName(String name) {
      * The name of the configuration.
      * </p>
      * 
-     * @return The name of the configuration.
+     * @return <p>
+     *         The name of the configuration.
+     *         </p>
      */
 
     public String getName() {
@@ -199,7 +221,9 @@ public String getName() {
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterRequest.java
index 2b8c91f65872..af23b2d2f7e5 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterRequest.java
@@ -44,7 +44,9 @@ public class DeleteClusterRequest extends com.amazonaws.AmazonWebServiceRequest
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -56,7 +58,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -69,7 +73,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -84,7 +90,9 @@ public DeleteClusterRequest withClusterArn(String clusterArn) {
      * </p>
      * 
      * @param currentVersion
+     *        <p>
      *        The current version of the MSK cluster.
+     *        </p>
      */
 
     public void setCurrentVersion(String currentVersion) {
@@ -96,7 +104,9 @@ public void setCurrentVersion(String currentVersion) {
      * The current version of the MSK cluster.
      * </p>
      * 
-     * @return The current version of the MSK cluster.
+     * @return <p>
+     *         The current version of the MSK cluster.
+     *         </p>
      */
 
     public String getCurrentVersion() {
@@ -109,7 +119,9 @@ public String getCurrentVersion() {
      * </p>
      * 
      * @param currentVersion
+     *        <p>
      *        The current version of the MSK cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterResult.java
index f5e12e0ad158..0ddba3cb2955 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DeleteClusterResult.java
@@ -42,7 +42,9 @@ public class DeleteClusterResult extends com.amazonaws.AmazonWebServiceResult<co
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -54,7 +56,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) of the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -67,7 +71,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -82,7 +88,9 @@ public DeleteClusterResult withClusterArn(String clusterArn) {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @see ClusterState
      */
 
@@ -95,7 +103,9 @@ public void setState(String state) {
      * The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
      * </p>
      * 
-     * @return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     * @return <p>
+     *         The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *         </p>
      * @see ClusterState
      */
 
@@ -109,7 +119,9 @@ public String getState() {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see ClusterState
      */
@@ -125,7 +137,9 @@ public DeleteClusterResult withState(String state) {
      * </p>
      * 
      * @param state
+     *        <p>
      *        The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see ClusterState
      */
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterOperationRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterOperationRequest.java
new file mode 100644
index 000000000000..9c81a7462765
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterOperationRequest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterOperation" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeClusterOperationRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     * </p>
+     */
+    private String clusterOperationArn;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     * </p>
+     * 
+     * @param clusterOperationArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     *        </p>
+     */
+
+    public void setClusterOperationArn(String clusterOperationArn) {
+        this.clusterOperationArn = clusterOperationArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     *         </p>
+     */
+
+    public String getClusterOperationArn() {
+        return this.clusterOperationArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     * </p>
+     * 
+     * @param clusterOperationArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeClusterOperationRequest withClusterOperationArn(String clusterOperationArn) {
+        setClusterOperationArn(clusterOperationArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterOperationArn() != null)
+            sb.append("ClusterOperationArn: ").append(getClusterOperationArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeClusterOperationRequest == false)
+            return false;
+        DescribeClusterOperationRequest other = (DescribeClusterOperationRequest) obj;
+        if (other.getClusterOperationArn() == null ^ this.getClusterOperationArn() == null)
+            return false;
+        if (other.getClusterOperationArn() != null && other.getClusterOperationArn().equals(this.getClusterOperationArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterOperationArn() == null) ? 0 : getClusterOperationArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeClusterOperationRequest clone() {
+        return (DescribeClusterOperationRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterOperationResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterOperationResult.java
new file mode 100644
index 000000000000..e27c4709b9de
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterOperationResult.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterOperation" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeClusterOperationResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Cluster operation information
+     * </p>
+     */
+    private ClusterOperationInfo clusterOperationInfo;
+
+    /**
+     * <p>
+     * Cluster operation information
+     * </p>
+     * 
+     * @param clusterOperationInfo
+     *        <p>
+     *        Cluster operation information
+     *        </p>
+     */
+
+    public void setClusterOperationInfo(ClusterOperationInfo clusterOperationInfo) {
+        this.clusterOperationInfo = clusterOperationInfo;
+    }
+
+    /**
+     * <p>
+     * Cluster operation information
+     * </p>
+     * 
+     * @return <p>
+     *         Cluster operation information
+     *         </p>
+     */
+
+    public ClusterOperationInfo getClusterOperationInfo() {
+        return this.clusterOperationInfo;
+    }
+
+    /**
+     * <p>
+     * Cluster operation information
+     * </p>
+     * 
+     * @param clusterOperationInfo
+     *        <p>
+     *        Cluster operation information
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DescribeClusterOperationResult withClusterOperationInfo(ClusterOperationInfo clusterOperationInfo) {
+        setClusterOperationInfo(clusterOperationInfo);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterOperationInfo() != null)
+            sb.append("ClusterOperationInfo: ").append(getClusterOperationInfo());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof DescribeClusterOperationResult == false)
+            return false;
+        DescribeClusterOperationResult other = (DescribeClusterOperationResult) obj;
+        if (other.getClusterOperationInfo() == null ^ this.getClusterOperationInfo() == null)
+            return false;
+        if (other.getClusterOperationInfo() != null && other.getClusterOperationInfo().equals(this.getClusterOperationInfo()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterOperationInfo() == null) ? 0 : getClusterOperationInfo().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public DescribeClusterOperationResult clone() {
+        try {
+            return (DescribeClusterOperationResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterRequest.java
index e8f8d4422d20..14de0e2edfa4 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterRequest.java
@@ -38,7 +38,9 @@ public class DescribeClusterRequest extends com.amazonaws.AmazonWebServiceReques
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -50,7 +52,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -63,7 +67,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterResult.java
index f39408496701..47d15a39a6ef 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeClusterResult.java
@@ -36,7 +36,9 @@ public class DescribeClusterResult extends com.amazonaws.AmazonWebServiceResult<
      * </p>
      * 
      * @param clusterInfo
+     *        <p>
      *        The cluster information.
+     *        </p>
      */
 
     public void setClusterInfo(ClusterInfo clusterInfo) {
@@ -48,7 +50,9 @@ public void setClusterInfo(ClusterInfo clusterInfo) {
      * The cluster information.
      * </p>
      * 
-     * @return The cluster information.
+     * @return <p>
+     *         The cluster information.
+     *         </p>
      */
 
     public ClusterInfo getClusterInfo() {
@@ -61,7 +65,9 @@ public ClusterInfo getClusterInfo() {
      * </p>
      * 
      * @param clusterInfo
+     *        <p>
      *        The cluster information.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRequest.java
index 26d97365fcbc..87d22fb33a9a 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRequest.java
@@ -38,7 +38,9 @@ public class DescribeConfigurationRequest extends com.amazonaws.AmazonWebService
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -50,7 +52,9 @@ public void setArn(String arn) {
      * The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *         </p>
      */
 
     public String getArn() {
@@ -63,7 +67,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationResult.java
index 5926f6e65a27..7ea209c4c2d7 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationResult.java
@@ -66,7 +66,9 @@ public class DescribeConfigurationResult extends com.amazonaws.AmazonWebServiceR
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -78,7 +80,9 @@ public void setArn(String arn) {
      * The Amazon Resource Name (ARN) of the configuration.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the configuration.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the configuration.
+     *         </p>
      */
 
     public String getArn() {
@@ -91,7 +95,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -106,7 +112,9 @@ public DescribeConfigurationResult withArn(String arn) {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      */
 
     public void setCreationTime(java.util.Date creationTime) {
@@ -118,7 +126,9 @@ public void setCreationTime(java.util.Date creationTime) {
      * The time when the configuration was created.
      * </p>
      * 
-     * @return The time when the configuration was created.
+     * @return <p>
+     *         The time when the configuration was created.
+     *         </p>
      */
 
     public java.util.Date getCreationTime() {
@@ -131,7 +141,9 @@ public java.util.Date getCreationTime() {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -146,7 +158,9 @@ public DescribeConfigurationResult withCreationTime(java.util.Date creationTime)
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      */
 
     public void setDescription(String description) {
@@ -158,7 +172,9 @@ public void setDescription(String description) {
      * The description of the configuration.
      * </p>
      * 
-     * @return The description of the configuration.
+     * @return <p>
+     *         The description of the configuration.
+     *         </p>
      */
 
     public String getDescription() {
@@ -171,7 +187,9 @@ public String getDescription() {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -185,7 +203,9 @@ public DescribeConfigurationResult withDescription(String description) {
      * The versions of Apache Kafka with which you can use this MSK configuration.
      * </p>
      * 
-     * @return The versions of Apache Kafka with which you can use this MSK configuration.
+     * @return <p>
+     *         The versions of Apache Kafka with which you can use this MSK configuration.
+     *         </p>
      */
 
     public java.util.List<String> getKafkaVersions() {
@@ -198,7 +218,9 @@ public java.util.List<String> getKafkaVersions() {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        The versions of Apache Kafka with which you can use this MSK configuration.
+     *        </p>
      */
 
     public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
@@ -214,6 +236,7 @@ public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
      * <p>
      * The versions of Apache Kafka with which you can use this MSK configuration.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want
@@ -221,7 +244,9 @@ public void setKafkaVersions(java.util.Collection<String> kafkaVersions) {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        The versions of Apache Kafka with which you can use this MSK configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -241,7 +266,9 @@ public DescribeConfigurationResult withKafkaVersions(String... kafkaVersions) {
      * </p>
      * 
      * @param kafkaVersions
+     *        <p>
      *        The versions of Apache Kafka with which you can use this MSK configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -256,7 +283,9 @@ public DescribeConfigurationResult withKafkaVersions(java.util.Collection<String
      * </p>
      * 
      * @param latestRevision
+     *        <p>
      *        Latest revision of the configuration.
+     *        </p>
      */
 
     public void setLatestRevision(ConfigurationRevision latestRevision) {
@@ -268,7 +297,9 @@ public void setLatestRevision(ConfigurationRevision latestRevision) {
      * Latest revision of the configuration.
      * </p>
      * 
-     * @return Latest revision of the configuration.
+     * @return <p>
+     *         Latest revision of the configuration.
+     *         </p>
      */
 
     public ConfigurationRevision getLatestRevision() {
@@ -281,7 +312,9 @@ public ConfigurationRevision getLatestRevision() {
      * </p>
      * 
      * @param latestRevision
+     *        <p>
      *        Latest revision of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -296,7 +329,9 @@ public DescribeConfigurationResult withLatestRevision(ConfigurationRevision late
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      */
 
     public void setName(String name) {
@@ -308,7 +343,9 @@ public void setName(String name) {
      * The name of the configuration.
      * </p>
      * 
-     * @return The name of the configuration.
+     * @return <p>
+     *         The name of the configuration.
+     *         </p>
      */
 
     public String getName() {
@@ -321,7 +358,9 @@ public String getName() {
      * </p>
      * 
      * @param name
+     *        <p>
      *        The name of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionRequest.java
index ac6f8bf60c3b..3c58e6f44e5a 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionRequest.java
@@ -44,7 +44,9 @@ public class DescribeConfigurationRevisionRequest extends com.amazonaws.AmazonWe
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -56,7 +58,9 @@ public void setArn(String arn) {
      * The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *         </p>
      */
 
     public String getArn() {
@@ -69,7 +73,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -84,7 +90,9 @@ public DescribeConfigurationRevisionRequest withArn(String arn) {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        A string that uniquely identifies a revision of an MSK configuration.
+     *        </p>
      */
 
     public void setRevision(Long revision) {
@@ -96,7 +104,9 @@ public void setRevision(Long revision) {
      * A string that uniquely identifies a revision of an MSK configuration.
      * </p>
      * 
-     * @return A string that uniquely identifies a revision of an MSK configuration.
+     * @return <p>
+     *         A string that uniquely identifies a revision of an MSK configuration.
+     *         </p>
      */
 
     public Long getRevision() {
@@ -109,7 +119,9 @@ public Long getRevision() {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        A string that uniquely identifies a revision of an MSK configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionResult.java
index 4d1f56680807..527577b4420b 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/DescribeConfigurationRevisionResult.java
@@ -50,9 +50,9 @@ public class DescribeConfigurationRevisionResult extends com.amazonaws.AmazonWeb
     private Long revision;
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
      */
     private java.nio.ByteBuffer serverProperties;
@@ -63,7 +63,9 @@ public class DescribeConfigurationRevisionResult extends com.amazonaws.AmazonWeb
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      */
 
     public void setArn(String arn) {
@@ -75,7 +77,9 @@ public void setArn(String arn) {
      * The Amazon Resource Name (ARN) of the configuration.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the configuration.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the configuration.
+     *         </p>
      */
 
     public String getArn() {
@@ -88,7 +92,9 @@ public String getArn() {
      * </p>
      * 
      * @param arn
+     *        <p>
      *        The Amazon Resource Name (ARN) of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -103,7 +109,9 @@ public DescribeConfigurationRevisionResult withArn(String arn) {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      */
 
     public void setCreationTime(java.util.Date creationTime) {
@@ -115,7 +123,9 @@ public void setCreationTime(java.util.Date creationTime) {
      * The time when the configuration was created.
      * </p>
      * 
-     * @return The time when the configuration was created.
+     * @return <p>
+     *         The time when the configuration was created.
+     *         </p>
      */
 
     public java.util.Date getCreationTime() {
@@ -128,7 +138,9 @@ public java.util.Date getCreationTime() {
      * </p>
      * 
      * @param creationTime
+     *        <p>
      *        The time when the configuration was created.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -143,7 +155,9 @@ public DescribeConfigurationRevisionResult withCreationTime(java.util.Date creat
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      */
 
     public void setDescription(String description) {
@@ -155,7 +169,9 @@ public void setDescription(String description) {
      * The description of the configuration.
      * </p>
      * 
-     * @return The description of the configuration.
+     * @return <p>
+     *         The description of the configuration.
+     *         </p>
      */
 
     public String getDescription() {
@@ -168,7 +184,9 @@ public String getDescription() {
      * </p>
      * 
      * @param description
+     *        <p>
      *        The description of the configuration.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -183,7 +201,9 @@ public DescribeConfigurationRevisionResult withDescription(String description) {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        The revision number.
+     *        </p>
      */
 
     public void setRevision(Long revision) {
@@ -195,7 +215,9 @@ public void setRevision(Long revision) {
      * The revision number.
      * </p>
      * 
-     * @return The revision number.
+     * @return <p>
+     *         The revision number.
+     *         </p>
      */
 
     public Long getRevision() {
@@ -208,7 +230,9 @@ public Long getRevision() {
      * </p>
      * 
      * @param revision
+     *        <p>
      *        The revision number.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -219,9 +243,9 @@ public DescribeConfigurationRevisionResult withRevision(Long revision) {
 
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
      * <p>
      * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
@@ -235,9 +259,11 @@ public DescribeConfigurationRevisionResult withRevision(Long revision) {
      * </p>
      * 
      * @param serverProperties
-     *        Contents of the server.properties file. When using the API, you must ensure that the contents of the file
-     *        are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of
-     *        server.properties can be in plaintext.
+     *        <p>
+     *        Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     *        contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI,
+     *        the contents of <filename>server.properties</filename> can be in plaintext.
+     *        </p>
      */
 
     public void setServerProperties(java.nio.ByteBuffer serverProperties) {
@@ -246,21 +272,24 @@ public void setServerProperties(java.nio.ByteBuffer serverProperties) {
 
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
+     * 
      * <p>
      * {@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend
      * using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent
-     * {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}.
-     * Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the
+     * {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}
+     * . Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the
      * {@code position}.
      * </p>
      * 
-     * @return Contents of the server.properties file. When using the API, you must ensure that the contents of the file
-     *         are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of
-     *         server.properties can be in plaintext.
+     * @return <p>
+     *         Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     *         contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI,
+     *         the contents of <filename>server.properties</filename> can be in plaintext.
+     *         </p>
      */
 
     public java.nio.ByteBuffer getServerProperties() {
@@ -269,9 +298,9 @@ public java.nio.ByteBuffer getServerProperties() {
 
     /**
      * <p>
-     * Contents of the server.properties file. When using the API, you must ensure that the contents of the file are
-     * base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties
-     * can be in plaintext.
+     * Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     * contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the
+     * contents of <filename>server.properties</filename> can be in plaintext.
      * </p>
      * <p>
      * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
@@ -285,9 +314,11 @@ public java.nio.ByteBuffer getServerProperties() {
      * </p>
      * 
      * @param serverProperties
-     *        Contents of the server.properties file. When using the API, you must ensure that the contents of the file
-     *        are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI, the contents of
-     *        server.properties can be in plaintext.
+     *        <p>
+     *        Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the
+     *        contents of the file are base64 encoded. When using the AWS Management Console, the SDK, or the AWS CLI,
+     *        the contents of <filename>server.properties</filename> can be in plaintext.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EBSStorageInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EBSStorageInfo.java
index 4f5286f738cb..c6341d0530a5 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EBSStorageInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EBSStorageInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Contains information about the EBS storage volumes attached to Kafka broker nodes.
  * </p>
  * 
@@ -41,7 +42,9 @@ public class EBSStorageInfo implements Serializable, Cloneable, StructuredPojo {
      * </p>
      * 
      * @param volumeSize
+     *        <p>
      *        The size in GiB of the EBS volume for the data drive on each broker node.
+     *        </p>
      */
 
     public void setVolumeSize(Integer volumeSize) {
@@ -53,7 +56,9 @@ public void setVolumeSize(Integer volumeSize) {
      * The size in GiB of the EBS volume for the data drive on each broker node.
      * </p>
      * 
-     * @return The size in GiB of the EBS volume for the data drive on each broker node.
+     * @return <p>
+     *         The size in GiB of the EBS volume for the data drive on each broker node.
+     *         </p>
      */
 
     public Integer getVolumeSize() {
@@ -66,7 +71,9 @@ public Integer getVolumeSize() {
      * </p>
      * 
      * @param volumeSize
+     *        <p>
      *        The size in GiB of the EBS volume for the data drive on each broker node.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionAtRest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionAtRest.java
index 15ae8b4ffd57..1f2fc146e516 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionAtRest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionAtRest.java
@@ -18,8 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
- * The data volume encryption details.
+ * 
+ <p>
+ * The data-volume encryption details.
  * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/EncryptionAtRest" target="_top">AWS API
@@ -30,18 +31,23 @@ public class EncryptionAtRest implements Serializable, Cloneable, StructuredPojo
 
     /**
      * <p>
-     * The AWS KMS key used for data encryption.
+     * The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you
+     * and uses it.
      * </p>
      */
     private String dataVolumeKMSKeyId;
 
     /**
      * <p>
-     * The AWS KMS key used for data encryption.
+     * The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you
+     * and uses it.
      * </p>
      * 
      * @param dataVolumeKMSKeyId
-     *        The AWS KMS key used for data encryption.
+     *        <p>
+     *        The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one
+     *        for you and uses it.
+     *        </p>
      */
 
     public void setDataVolumeKMSKeyId(String dataVolumeKMSKeyId) {
@@ -50,10 +56,14 @@ public void setDataVolumeKMSKeyId(String dataVolumeKMSKeyId) {
 
     /**
      * <p>
-     * The AWS KMS key used for data encryption.
+     * The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you
+     * and uses it.
      * </p>
      * 
-     * @return The AWS KMS key used for data encryption.
+     * @return <p>
+     *         The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one
+     *         for you and uses it.
+     *         </p>
      */
 
     public String getDataVolumeKMSKeyId() {
@@ -62,11 +72,15 @@ public String getDataVolumeKMSKeyId() {
 
     /**
      * <p>
-     * The AWS KMS key used for data encryption.
+     * The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you
+     * and uses it.
      * </p>
      * 
      * @param dataVolumeKMSKeyId
-     *        The AWS KMS key used for data encryption.
+     *        <p>
+     *        The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one
+     *        for you and uses it.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInTransit.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInTransit.java
new file mode 100644
index 000000000000..8d49e2f124e3
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInTransit.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * The settings for encrypting data in transit.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/EncryptionInTransit" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class EncryptionInTransit implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Indicates the encryption setting for data in transit between clients and brokers. The following are the possible
+     * values.
+     * </p>
+     * <p>
+     * TLS means that client-broker communication is enabled with TLS only.
+     * </p>
+     * <p>
+     * TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext
+     * data.
+     * </p>
+     * <p>
+     * PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     * </p>
+     * <p>
+     * The default value is TLS_PLAINTEXT.
+     * </p>
+     */
+    private String clientBroker;
+    /**
+     * <p>
+     * When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When
+     * set to false, the communication happens in plaintext.
+     * </p>
+     * <p>
+     * The default value is true.
+     * </p>
+     */
+    private Boolean inCluster;
+
+    /**
+     * <p>
+     * Indicates the encryption setting for data in transit between clients and brokers. The following are the possible
+     * values.
+     * </p>
+     * <p>
+     * TLS means that client-broker communication is enabled with TLS only.
+     * </p>
+     * <p>
+     * TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext
+     * data.
+     * </p>
+     * <p>
+     * PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     * </p>
+     * <p>
+     * The default value is TLS_PLAINTEXT.
+     * </p>
+     * 
+     * @param clientBroker
+     *        <p>
+     *        Indicates the encryption setting for data in transit between clients and brokers. The following are the
+     *        possible values.
+     *        </p>
+     *        <p>
+     *        TLS means that client-broker communication is enabled with TLS only.
+     *        </p>
+     *        <p>
+     *        TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as
+     *        plaintext data.
+     *        </p>
+     *        <p>
+     *        PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     *        </p>
+     *        <p>
+     *        The default value is TLS_PLAINTEXT.
+     *        </p>
+     * @see ClientBroker
+     */
+
+    public void setClientBroker(String clientBroker) {
+        this.clientBroker = clientBroker;
+    }
+
+    /**
+     * <p>
+     * Indicates the encryption setting for data in transit between clients and brokers. The following are the possible
+     * values.
+     * </p>
+     * <p>
+     * TLS means that client-broker communication is enabled with TLS only.
+     * </p>
+     * <p>
+     * TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext
+     * data.
+     * </p>
+     * <p>
+     * PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     * </p>
+     * <p>
+     * The default value is TLS_PLAINTEXT.
+     * </p>
+     * 
+     * @return <p>
+     *         Indicates the encryption setting for data in transit between clients and brokers. The following are the
+     *         possible values.
+     *         </p>
+     *         <p>
+     *         TLS means that client-broker communication is enabled with TLS only.
+     *         </p>
+     *         <p>
+     *         TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as
+     *         plaintext data.
+     *         </p>
+     *         <p>
+     *         PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     *         </p>
+     *         <p>
+     *         The default value is TLS_PLAINTEXT.
+     *         </p>
+     * @see ClientBroker
+     */
+
+    public String getClientBroker() {
+        return this.clientBroker;
+    }
+
+    /**
+     * <p>
+     * Indicates the encryption setting for data in transit between clients and brokers. The following are the possible
+     * values.
+     * </p>
+     * <p>
+     * TLS means that client-broker communication is enabled with TLS only.
+     * </p>
+     * <p>
+     * TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext
+     * data.
+     * </p>
+     * <p>
+     * PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     * </p>
+     * <p>
+     * The default value is TLS_PLAINTEXT.
+     * </p>
+     * 
+     * @param clientBroker
+     *        <p>
+     *        Indicates the encryption setting for data in transit between clients and brokers. The following are the
+     *        possible values.
+     *        </p>
+     *        <p>
+     *        TLS means that client-broker communication is enabled with TLS only.
+     *        </p>
+     *        <p>
+     *        TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as
+     *        plaintext data.
+     *        </p>
+     *        <p>
+     *        PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     *        </p>
+     *        <p>
+     *        The default value is TLS_PLAINTEXT.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ClientBroker
+     */
+
+    public EncryptionInTransit withClientBroker(String clientBroker) {
+        setClientBroker(clientBroker);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Indicates the encryption setting for data in transit between clients and brokers. The following are the possible
+     * values.
+     * </p>
+     * <p>
+     * TLS means that client-broker communication is enabled with TLS only.
+     * </p>
+     * <p>
+     * TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext
+     * data.
+     * </p>
+     * <p>
+     * PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     * </p>
+     * <p>
+     * The default value is TLS_PLAINTEXT.
+     * </p>
+     * 
+     * @param clientBroker
+     *        <p>
+     *        Indicates the encryption setting for data in transit between clients and brokers. The following are the
+     *        possible values.
+     *        </p>
+     *        <p>
+     *        TLS means that client-broker communication is enabled with TLS only.
+     *        </p>
+     *        <p>
+     *        TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as
+     *        plaintext data.
+     *        </p>
+     *        <p>
+     *        PLAINTEXT means that client-broker communication is enabled in plaintext only.
+     *        </p>
+     *        <p>
+     *        The default value is TLS_PLAINTEXT.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ClientBroker
+     */
+
+    public EncryptionInTransit withClientBroker(ClientBroker clientBroker) {
+        this.clientBroker = clientBroker.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When
+     * set to false, the communication happens in plaintext.
+     * </p>
+     * <p>
+     * The default value is true.
+     * </p>
+     * 
+     * @param inCluster
+     *        <p>
+     *        When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted.
+     *        When set to false, the communication happens in plaintext.
+     *        </p>
+     *        <p>
+     *        The default value is true.
+     *        </p>
+     */
+
+    public void setInCluster(Boolean inCluster) {
+        this.inCluster = inCluster;
+    }
+
+    /**
+     * <p>
+     * When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When
+     * set to false, the communication happens in plaintext.
+     * </p>
+     * <p>
+     * The default value is true.
+     * </p>
+     * 
+     * @return <p>
+     *         When set to true, it indicates that data communication among the broker nodes of the cluster is
+     *         encrypted. When set to false, the communication happens in plaintext.
+     *         </p>
+     *         <p>
+     *         The default value is true.
+     *         </p>
+     */
+
+    public Boolean getInCluster() {
+        return this.inCluster;
+    }
+
+    /**
+     * <p>
+     * When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When
+     * set to false, the communication happens in plaintext.
+     * </p>
+     * <p>
+     * The default value is true.
+     * </p>
+     * 
+     * @param inCluster
+     *        <p>
+     *        When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted.
+     *        When set to false, the communication happens in plaintext.
+     *        </p>
+     *        <p>
+     *        The default value is true.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public EncryptionInTransit withInCluster(Boolean inCluster) {
+        setInCluster(inCluster);
+        return this;
+    }
+
+    /**
+     * <p>
+     * When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When
+     * set to false, the communication happens in plaintext.
+     * </p>
+     * <p>
+     * The default value is true.
+     * </p>
+     * 
+     * @return <p>
+     *         When set to true, it indicates that data communication among the broker nodes of the cluster is
+     *         encrypted. When set to false, the communication happens in plaintext.
+     *         </p>
+     *         <p>
+     *         The default value is true.
+     *         </p>
+     */
+
+    public Boolean isInCluster() {
+        return this.inCluster;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClientBroker() != null)
+            sb.append("ClientBroker: ").append(getClientBroker()).append(",");
+        if (getInCluster() != null)
+            sb.append("InCluster: ").append(getInCluster());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof EncryptionInTransit == false)
+            return false;
+        EncryptionInTransit other = (EncryptionInTransit) obj;
+        if (other.getClientBroker() == null ^ this.getClientBroker() == null)
+            return false;
+        if (other.getClientBroker() != null && other.getClientBroker().equals(this.getClientBroker()) == false)
+            return false;
+        if (other.getInCluster() == null ^ this.getInCluster() == null)
+            return false;
+        if (other.getInCluster() != null && other.getInCluster().equals(this.getInCluster()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClientBroker() == null) ? 0 : getClientBroker().hashCode());
+        hashCode = prime * hashCode + ((getInCluster() == null) ? 0 : getInCluster().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public EncryptionInTransit clone() {
+        try {
+            return (EncryptionInTransit) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.EncryptionInTransitMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInfo.java
index 77f3cd8a3dcd..250275d976fc 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EncryptionInfo.java
@@ -18,8 +18,10 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
- * Includes encryption-related information, such as the AWS KMS key used for encrypting data at rest.
+ * 
+ <p>
+ * Includes encryption-related information, such as the AWS KMS key used for encrypting data at rest and whether you
+ * want MSK to encrypt your data in transit.
  * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/EncryptionInfo" target="_top">AWS API
@@ -30,18 +32,26 @@ public class EncryptionInfo implements Serializable, Cloneable, StructuredPojo {
 
     /**
      * <p>
-     * The data volume encryption details.
+     * The data-volume encryption details.
      * </p>
      */
     private EncryptionAtRest encryptionAtRest;
+    /**
+     * <p>
+     * The details for encryption in transit.
+     * </p>
+     */
+    private EncryptionInTransit encryptionInTransit;
 
     /**
      * <p>
-     * The data volume encryption details.
+     * The data-volume encryption details.
      * </p>
      * 
      * @param encryptionAtRest
-     *        The data volume encryption details.
+     *        <p>
+     *        The data-volume encryption details.
+     *        </p>
      */
 
     public void setEncryptionAtRest(EncryptionAtRest encryptionAtRest) {
@@ -50,10 +60,12 @@ public void setEncryptionAtRest(EncryptionAtRest encryptionAtRest) {
 
     /**
      * <p>
-     * The data volume encryption details.
+     * The data-volume encryption details.
      * </p>
      * 
-     * @return The data volume encryption details.
+     * @return <p>
+     *         The data-volume encryption details.
+     *         </p>
      */
 
     public EncryptionAtRest getEncryptionAtRest() {
@@ -62,11 +74,13 @@ public EncryptionAtRest getEncryptionAtRest() {
 
     /**
      * <p>
-     * The data volume encryption details.
+     * The data-volume encryption details.
      * </p>
      * 
      * @param encryptionAtRest
-     *        The data volume encryption details.
+     *        <p>
+     *        The data-volume encryption details.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -75,6 +89,52 @@ public EncryptionInfo withEncryptionAtRest(EncryptionAtRest encryptionAtRest) {
         return this;
     }
 
+    /**
+     * <p>
+     * The details for encryption in transit.
+     * </p>
+     * 
+     * @param encryptionInTransit
+     *        <p>
+     *        The details for encryption in transit.
+     *        </p>
+     */
+
+    public void setEncryptionInTransit(EncryptionInTransit encryptionInTransit) {
+        this.encryptionInTransit = encryptionInTransit;
+    }
+
+    /**
+     * <p>
+     * The details for encryption in transit.
+     * </p>
+     * 
+     * @return <p>
+     *         The details for encryption in transit.
+     *         </p>
+     */
+
+    public EncryptionInTransit getEncryptionInTransit() {
+        return this.encryptionInTransit;
+    }
+
+    /**
+     * <p>
+     * The details for encryption in transit.
+     * </p>
+     * 
+     * @param encryptionInTransit
+     *        <p>
+     *        The details for encryption in transit.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public EncryptionInfo withEncryptionInTransit(EncryptionInTransit encryptionInTransit) {
+        setEncryptionInTransit(encryptionInTransit);
+        return this;
+    }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -88,7 +148,9 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("{");
         if (getEncryptionAtRest() != null)
-            sb.append("EncryptionAtRest: ").append(getEncryptionAtRest());
+            sb.append("EncryptionAtRest: ").append(getEncryptionAtRest()).append(",");
+        if (getEncryptionInTransit() != null)
+            sb.append("EncryptionInTransit: ").append(getEncryptionInTransit());
         sb.append("}");
         return sb.toString();
     }
@@ -107,6 +169,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getEncryptionAtRest() != null && other.getEncryptionAtRest().equals(this.getEncryptionAtRest()) == false)
             return false;
+        if (other.getEncryptionInTransit() == null ^ this.getEncryptionInTransit() == null)
+            return false;
+        if (other.getEncryptionInTransit() != null && other.getEncryptionInTransit().equals(this.getEncryptionInTransit()) == false)
+            return false;
         return true;
     }
 
@@ -116,6 +182,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getEncryptionAtRest() == null) ? 0 : getEncryptionAtRest().hashCode());
+        hashCode = prime * hashCode + ((getEncryptionInTransit() == null) ? 0 : getEncryptionInTransit().hashCode());
         return hashCode;
     }
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EnhancedMonitoring.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EnhancedMonitoring.java
index ce633e5a73d4..cea837964d9a 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EnhancedMonitoring.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/EnhancedMonitoring.java
@@ -15,9 +15,11 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT,
- * PER_BROKER, and PER_TOPIC_PER_BROKER.
+ * PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of
+ * monitoring, see <a href="https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html">Monitoring</a>.
  * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ErrorInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ErrorInfo.java
new file mode 100644
index 000000000000..0f003dac324d
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ErrorInfo.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * Returns information about an error state of the cluster.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ErrorInfo" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ErrorInfo implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * A number describing the error programmatically.
+     * </p>
+     */
+    private String errorCode;
+    /**
+     * <p>
+     * An optional field to provide more details about the error.
+     * </p>
+     */
+    private String errorString;
+
+    /**
+     * <p>
+     * A number describing the error programmatically.
+     * </p>
+     * 
+     * @param errorCode
+     *        <p>
+     *        A number describing the error programmatically.
+     *        </p>
+     */
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    /**
+     * <p>
+     * A number describing the error programmatically.
+     * </p>
+     * 
+     * @return <p>
+     *         A number describing the error programmatically.
+     *         </p>
+     */
+
+    public String getErrorCode() {
+        return this.errorCode;
+    }
+
+    /**
+     * <p>
+     * A number describing the error programmatically.
+     * </p>
+     * 
+     * @param errorCode
+     *        <p>
+     *        A number describing the error programmatically.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ErrorInfo withErrorCode(String errorCode) {
+        setErrorCode(errorCode);
+        return this;
+    }
+
+    /**
+     * <p>
+     * An optional field to provide more details about the error.
+     * </p>
+     * 
+     * @param errorString
+     *        <p>
+     *        An optional field to provide more details about the error.
+     *        </p>
+     */
+
+    public void setErrorString(String errorString) {
+        this.errorString = errorString;
+    }
+
+    /**
+     * <p>
+     * An optional field to provide more details about the error.
+     * </p>
+     * 
+     * @return <p>
+     *         An optional field to provide more details about the error.
+     *         </p>
+     */
+
+    public String getErrorString() {
+        return this.errorString;
+    }
+
+    /**
+     * <p>
+     * An optional field to provide more details about the error.
+     * </p>
+     * 
+     * @param errorString
+     *        <p>
+     *        An optional field to provide more details about the error.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ErrorInfo withErrorString(String errorString) {
+        setErrorString(errorString);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getErrorCode() != null)
+            sb.append("ErrorCode: ").append(getErrorCode()).append(",");
+        if (getErrorString() != null)
+            sb.append("ErrorString: ").append(getErrorString());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ErrorInfo == false)
+            return false;
+        ErrorInfo other = (ErrorInfo) obj;
+        if (other.getErrorCode() == null ^ this.getErrorCode() == null)
+            return false;
+        if (other.getErrorCode() != null && other.getErrorCode().equals(this.getErrorCode()) == false)
+            return false;
+        if (other.getErrorString() == null ^ this.getErrorString() == null)
+            return false;
+        if (other.getErrorString() != null && other.getErrorString().equals(this.getErrorString()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
+        hashCode = prime * hashCode + ((getErrorString() == null) ? 0 : getErrorString().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ErrorInfo clone() {
+        try {
+            return (ErrorInfo) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.ErrorInfoMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ForbiddenException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ForbiddenException.java
index b4afe53e8c65..49aaa3128dcb 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ForbiddenException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ForbiddenException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public ForbiddenException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersRequest.java
index 01907402c46f..23bad5e2f51d 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersRequest.java
@@ -38,7 +38,9 @@ public class GetBootstrapBrokersRequest extends com.amazonaws.AmazonWebServiceRe
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -50,7 +52,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -63,7 +67,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersResult.java
index 33dc7fa86cb8..755d6946bfa7 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/GetBootstrapBrokersResult.java
@@ -29,6 +29,12 @@ public class GetBootstrapBrokersResult extends com.amazonaws.AmazonWebServiceRes
      * </p>
      */
     private String bootstrapBrokerString;
+    /**
+     * <p>
+     * A string containing one or more DNS names (or IP) and TLS port pairs.
+     * </p>
+     */
+    private String bootstrapBrokerStringTls;
 
     /**
      * <p>
@@ -36,7 +42,9 @@ public class GetBootstrapBrokersResult extends com.amazonaws.AmazonWebServiceRes
      * </p>
      * 
      * @param bootstrapBrokerString
+     *        <p>
      *        A string containing one or more hostname:port pairs.
+     *        </p>
      */
 
     public void setBootstrapBrokerString(String bootstrapBrokerString) {
@@ -48,7 +56,9 @@ public void setBootstrapBrokerString(String bootstrapBrokerString) {
      * A string containing one or more hostname:port pairs.
      * </p>
      * 
-     * @return A string containing one or more hostname:port pairs.
+     * @return <p>
+     *         A string containing one or more hostname:port pairs.
+     *         </p>
      */
 
     public String getBootstrapBrokerString() {
@@ -61,7 +71,9 @@ public String getBootstrapBrokerString() {
      * </p>
      * 
      * @param bootstrapBrokerString
+     *        <p>
      *        A string containing one or more hostname:port pairs.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -70,6 +82,52 @@ public GetBootstrapBrokersResult withBootstrapBrokerString(String bootstrapBroke
         return this;
     }
 
+    /**
+     * <p>
+     * A string containing one or more DNS names (or IP) and TLS port pairs.
+     * </p>
+     * 
+     * @param bootstrapBrokerStringTls
+     *        <p>
+     *        A string containing one or more DNS names (or IP) and TLS port pairs.
+     *        </p>
+     */
+
+    public void setBootstrapBrokerStringTls(String bootstrapBrokerStringTls) {
+        this.bootstrapBrokerStringTls = bootstrapBrokerStringTls;
+    }
+
+    /**
+     * <p>
+     * A string containing one or more DNS names (or IP) and TLS port pairs.
+     * </p>
+     * 
+     * @return <p>
+     *         A string containing one or more DNS names (or IP) and TLS port pairs.
+     *         </p>
+     */
+
+    public String getBootstrapBrokerStringTls() {
+        return this.bootstrapBrokerStringTls;
+    }
+
+    /**
+     * <p>
+     * A string containing one or more DNS names (or IP) and TLS port pairs.
+     * </p>
+     * 
+     * @param bootstrapBrokerStringTls
+     *        <p>
+     *        A string containing one or more DNS names (or IP) and TLS port pairs.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public GetBootstrapBrokersResult withBootstrapBrokerStringTls(String bootstrapBrokerStringTls) {
+        setBootstrapBrokerStringTls(bootstrapBrokerStringTls);
+        return this;
+    }
+
     /**
      * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
      * redacted from this string using a placeholder value.
@@ -83,7 +141,9 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("{");
         if (getBootstrapBrokerString() != null)
-            sb.append("BootstrapBrokerString: ").append(getBootstrapBrokerString());
+            sb.append("BootstrapBrokerString: ").append(getBootstrapBrokerString()).append(",");
+        if (getBootstrapBrokerStringTls() != null)
+            sb.append("BootstrapBrokerStringTls: ").append(getBootstrapBrokerStringTls());
         sb.append("}");
         return sb.toString();
     }
@@ -102,6 +162,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getBootstrapBrokerString() != null && other.getBootstrapBrokerString().equals(this.getBootstrapBrokerString()) == false)
             return false;
+        if (other.getBootstrapBrokerStringTls() == null ^ this.getBootstrapBrokerStringTls() == null)
+            return false;
+        if (other.getBootstrapBrokerStringTls() != null && other.getBootstrapBrokerStringTls().equals(this.getBootstrapBrokerStringTls()) == false)
+            return false;
         return true;
     }
 
@@ -111,6 +175,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getBootstrapBrokerString() == null) ? 0 : getBootstrapBrokerString().hashCode());
+        hashCode = prime * hashCode + ((getBootstrapBrokerStringTls() == null) ? 0 : getBootstrapBrokerStringTls().hashCode());
         return hashCode;
     }
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/InternalServerErrorException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/InternalServerErrorException.java
index 13c051acddc0..84e036c9b106 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/InternalServerErrorException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/InternalServerErrorException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public InternalServerErrorException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClusterOperationsRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClusterOperationsRequest.java
new file mode 100644
index 000000000000..9be827443fb4
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClusterOperationsRequest.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusterOperations" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListClusterOperationsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     */
+    private String clusterArn;
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     */
+    private Integer maxResults;
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
+     */
+
+    public void setClusterArn(String clusterArn) {
+        this.clusterArn = clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
+     */
+
+    public String getClusterArn() {
+        return this.clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListClusterOperationsRequest withClusterArn(String clusterArn) {
+        setClusterArn(clusterArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     * 
+     * @param maxResults
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
+     */
+
+    public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     * 
+     * @return <p>
+     *         The maximum number of results to return in the response. If there are more results, the response includes
+     *         a NextToken parameter.
+     *         </p>
+     */
+
+    public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     * 
+     * @param maxResults
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListClusterOperationsRequest withMaxResults(Integer maxResults) {
+        setMaxResults(maxResults);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     * 
+     * @return <p>
+     *         The paginated results marker. When the result of the operation is truncated, the call returns NextToken
+     *         in the response. To get the next batch, provide this token in your next request.
+     *         </p>
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListClusterOperationsRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterArn() != null)
+            sb.append("ClusterArn: ").append(getClusterArn()).append(",");
+        if (getMaxResults() != null)
+            sb.append("MaxResults: ").append(getMaxResults()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListClusterOperationsRequest == false)
+            return false;
+        ListClusterOperationsRequest other = (ListClusterOperationsRequest) obj;
+        if (other.getClusterArn() == null ^ this.getClusterArn() == null)
+            return false;
+        if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
+            return false;
+        if (other.getMaxResults() == null ^ this.getMaxResults() == null)
+            return false;
+        if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
+        hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListClusterOperationsRequest clone() {
+        return (ListClusterOperationsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClusterOperationsResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClusterOperationsResult.java
new file mode 100644
index 000000000000..8fb7708ca1de
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClusterOperationsResult.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClusterOperations" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListClusterOperationsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * An array of cluster operation information objects.
+     * </p>
+     */
+    private java.util.List<ClusterOperationInfo> clusterOperationInfoList;
+    /**
+     * <p>
+     * If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken
+     * should be sent in the subsequent request to ListClusterOperations.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * An array of cluster operation information objects.
+     * </p>
+     * 
+     * @return <p>
+     *         An array of cluster operation information objects.
+     *         </p>
+     */
+
+    public java.util.List<ClusterOperationInfo> getClusterOperationInfoList() {
+        return clusterOperationInfoList;
+    }
+
+    /**
+     * <p>
+     * An array of cluster operation information objects.
+     * </p>
+     * 
+     * @param clusterOperationInfoList
+     *        <p>
+     *        An array of cluster operation information objects.
+     *        </p>
+     */
+
+    public void setClusterOperationInfoList(java.util.Collection<ClusterOperationInfo> clusterOperationInfoList) {
+        if (clusterOperationInfoList == null) {
+            this.clusterOperationInfoList = null;
+            return;
+        }
+
+        this.clusterOperationInfoList = new java.util.ArrayList<ClusterOperationInfo>(clusterOperationInfoList);
+    }
+
+    /**
+     * <p>
+     * An array of cluster operation information objects.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setClusterOperationInfoList(java.util.Collection)} or
+     * {@link #withClusterOperationInfoList(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param clusterOperationInfoList
+     *        <p>
+     *        An array of cluster operation information objects.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListClusterOperationsResult withClusterOperationInfoList(ClusterOperationInfo... clusterOperationInfoList) {
+        if (this.clusterOperationInfoList == null) {
+            setClusterOperationInfoList(new java.util.ArrayList<ClusterOperationInfo>(clusterOperationInfoList.length));
+        }
+        for (ClusterOperationInfo ele : clusterOperationInfoList) {
+            this.clusterOperationInfoList.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * An array of cluster operation information objects.
+     * </p>
+     * 
+     * @param clusterOperationInfoList
+     *        <p>
+     *        An array of cluster operation information objects.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListClusterOperationsResult withClusterOperationInfoList(java.util.Collection<ClusterOperationInfo> clusterOperationInfoList) {
+        setClusterOperationInfoList(clusterOperationInfoList);
+        return this;
+    }
+
+    /**
+     * <p>
+     * If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken
+     * should be sent in the subsequent request to ListClusterOperations.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This
+     *        Nexttoken should be sent in the subsequent request to ListClusterOperations.
+     *        </p>
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken
+     * should be sent in the subsequent request to ListClusterOperations.
+     * </p>
+     * 
+     * @return <p>
+     *         If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This
+     *         Nexttoken should be sent in the subsequent request to ListClusterOperations.
+     *         </p>
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken
+     * should be sent in the subsequent request to ListClusterOperations.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This
+     *        Nexttoken should be sent in the subsequent request to ListClusterOperations.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListClusterOperationsResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterOperationInfoList() != null)
+            sb.append("ClusterOperationInfoList: ").append(getClusterOperationInfoList()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListClusterOperationsResult == false)
+            return false;
+        ListClusterOperationsResult other = (ListClusterOperationsResult) obj;
+        if (other.getClusterOperationInfoList() == null ^ this.getClusterOperationInfoList() == null)
+            return false;
+        if (other.getClusterOperationInfoList() != null && other.getClusterOperationInfoList().equals(this.getClusterOperationInfoList()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterOperationInfoList() == null) ? 0 : getClusterOperationInfoList().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListClusterOperationsResult clone() {
+        try {
+            return (ListClusterOperationsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersRequest.java
index 16966d7110df..de79a3c0d0b6 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersRequest.java
@@ -34,15 +34,15 @@ public class ListClustersRequest extends com.amazonaws.AmazonWebServiceRequest i
     private String clusterNameFilter;
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      */
     private Integer maxResults;
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      */
     private String nextToken;
@@ -54,8 +54,10 @@ public class ListClustersRequest extends com.amazonaws.AmazonWebServiceRequest i
      * </p>
      * 
      * @param clusterNameFilter
+     *        <p>
      *        Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters
      *        whose names start with this prefix.
+     *        </p>
      */
 
     public void setClusterNameFilter(String clusterNameFilter) {
@@ -68,8 +70,10 @@ public void setClusterNameFilter(String clusterNameFilter) {
      * names start with this prefix.
      * </p>
      * 
-     * @return Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters
+     * @return <p>
+     *         Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters
      *         whose names start with this prefix.
+     *         </p>
      */
 
     public String getClusterNameFilter() {
@@ -83,8 +87,10 @@ public String getClusterNameFilter() {
      * </p>
      * 
      * @param clusterNameFilter
+     *        <p>
      *        Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters
      *        whose names start with this prefix.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -95,13 +101,15 @@ public ListClustersRequest withClusterNameFilter(String clusterNameFilter) {
 
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      * 
      * @param maxResults
-     *        The maximum number of clusters to return in the response. If there are more clusters, the response
-     *        includes a NextToken parameter.
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
      */
 
     public void setMaxResults(Integer maxResults) {
@@ -110,12 +118,14 @@ public void setMaxResults(Integer maxResults) {
 
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      * 
-     * @return The maximum number of clusters to return in the response. If there are more clusters, the response
-     *         includes a NextToken parameter.
+     * @return <p>
+     *         The maximum number of results to return in the response. If there are more results, the response includes
+     *         a NextToken parameter.
+     *         </p>
      */
 
     public Integer getMaxResults() {
@@ -124,13 +134,15 @@ public Integer getMaxResults() {
 
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      * 
      * @param maxResults
-     *        The maximum number of clusters to return in the response. If there are more clusters, the response
-     *        includes a NextToken parameter.
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -141,13 +153,15 @@ public ListClustersRequest withMaxResults(Integer maxResults) {
 
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
      * @param nextToken
-     *        The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     *        NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
      */
 
     public void setNextToken(String nextToken) {
@@ -156,12 +170,14 @@ public void setNextToken(String nextToken) {
 
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
-     * @return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     *         NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * @return <p>
+     *         The paginated results marker. When the result of the operation is truncated, the call returns NextToken
+     *         in the response. To get the next batch, provide this token in your next request.
+     *         </p>
      */
 
     public String getNextToken() {
@@ -170,13 +186,15 @@ public String getNextToken() {
 
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
      * @param nextToken
-     *        The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     *        NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersResult.java
index 827991f41492..b9c56e91eb73 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListClustersResult.java
@@ -42,7 +42,9 @@ public class ListClustersResult extends com.amazonaws.AmazonWebServiceResult<com
      * Information on each of the MSK clusters in the response.
      * </p>
      * 
-     * @return Information on each of the MSK clusters in the response.
+     * @return <p>
+     *         Information on each of the MSK clusters in the response.
+     *         </p>
      */
 
     public java.util.List<ClusterInfo> getClusterInfoList() {
@@ -55,7 +57,9 @@ public java.util.List<ClusterInfo> getClusterInfoList() {
      * </p>
      * 
      * @param clusterInfoList
+     *        <p>
      *        Information on each of the MSK clusters in the response.
+     *        </p>
      */
 
     public void setClusterInfoList(java.util.Collection<ClusterInfo> clusterInfoList) {
@@ -71,6 +75,7 @@ public void setClusterInfoList(java.util.Collection<ClusterInfo> clusterInfoList
      * <p>
      * Information on each of the MSK clusters in the response.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setClusterInfoList(java.util.Collection)} or {@link #withClusterInfoList(java.util.Collection)} if you
@@ -78,7 +83,9 @@ public void setClusterInfoList(java.util.Collection<ClusterInfo> clusterInfoList
      * </p>
      * 
      * @param clusterInfoList
+     *        <p>
      *        Information on each of the MSK clusters in the response.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -98,7 +105,9 @@ public ListClustersResult withClusterInfoList(ClusterInfo... clusterInfoList) {
      * </p>
      * 
      * @param clusterInfoList
+     *        <p>
      *        Information on each of the MSK clusters in the response.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -114,8 +123,10 @@ public ListClustersResult withClusterInfoList(java.util.Collection<ClusterInfo>
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
      *        NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *        </p>
      */
 
     public void setNextToken(String nextToken) {
@@ -128,8 +139,10 @@ public void setNextToken(String nextToken) {
      * NextToken in the response. To get another batch of clusters, provide this token in your next request.
      * </p>
      * 
-     * @return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
+     * @return <p>
+     *         The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
      *         NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *         </p>
      */
 
     public String getNextToken() {
@@ -143,8 +156,10 @@ public String getNextToken() {
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
      *        NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationRevisionsRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationRevisionsRequest.java
new file mode 100644
index 000000000000..c7f76dcd32fe
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationRevisionsRequest.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurationRevisions" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListConfigurationRevisionsRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     * </p>
+     */
+    private String arn;
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     */
+    private Integer maxResults;
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     */
+    private String nextToken;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     * </p>
+     * 
+     * @param arn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *        </p>
+     */
+
+    public void setArn(String arn) {
+        this.arn = arn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *         </p>
+     */
+
+    public String getArn() {
+        return this.arn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     * </p>
+     * 
+     * @param arn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListConfigurationRevisionsRequest withArn(String arn) {
+        setArn(arn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     * 
+     * @param maxResults
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
+     */
+
+    public void setMaxResults(Integer maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     * 
+     * @return <p>
+     *         The maximum number of results to return in the response. If there are more results, the response includes
+     *         a NextToken parameter.
+     *         </p>
+     */
+
+    public Integer getMaxResults() {
+        return this.maxResults;
+    }
+
+    /**
+     * <p>
+     * The maximum number of results to return in the response. If there are more results, the response includes a
+     * NextToken parameter.
+     * </p>
+     * 
+     * @param maxResults
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListConfigurationRevisionsRequest withMaxResults(Integer maxResults) {
+        setMaxResults(maxResults);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     * 
+     * @return <p>
+     *         The paginated results marker. When the result of the operation is truncated, the call returns NextToken
+     *         in the response. To get the next batch, provide this token in your next request.
+     *         </p>
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListConfigurationRevisionsRequest withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getArn() != null)
+            sb.append("Arn: ").append(getArn()).append(",");
+        if (getMaxResults() != null)
+            sb.append("MaxResults: ").append(getMaxResults()).append(",");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListConfigurationRevisionsRequest == false)
+            return false;
+        ListConfigurationRevisionsRequest other = (ListConfigurationRevisionsRequest) obj;
+        if (other.getArn() == null ^ this.getArn() == null)
+            return false;
+        if (other.getArn() != null && other.getArn().equals(this.getArn()) == false)
+            return false;
+        if (other.getMaxResults() == null ^ this.getMaxResults() == null)
+            return false;
+        if (other.getMaxResults() != null && other.getMaxResults().equals(this.getMaxResults()) == false)
+            return false;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getArn() == null) ? 0 : getArn().hashCode());
+        hashCode = prime * hashCode + ((getMaxResults() == null) ? 0 : getMaxResults().hashCode());
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListConfigurationRevisionsRequest clone() {
+        return (ListConfigurationRevisionsRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationRevisionsResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationRevisionsResult.java
new file mode 100644
index 000000000000..45b72c26bf5c
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationRevisionsResult.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListConfigurationRevisions" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListConfigurationRevisionsResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Paginated results marker.
+     * </p>
+     */
+    private String nextToken;
+    /**
+     * <p>
+     * List of ConfigurationRevision objects.
+     * </p>
+     */
+    private java.util.List<ConfigurationRevision> revisions;
+
+    /**
+     * <p>
+     * Paginated results marker.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        Paginated results marker.
+     *        </p>
+     */
+
+    public void setNextToken(String nextToken) {
+        this.nextToken = nextToken;
+    }
+
+    /**
+     * <p>
+     * Paginated results marker.
+     * </p>
+     * 
+     * @return <p>
+     *         Paginated results marker.
+     *         </p>
+     */
+
+    public String getNextToken() {
+        return this.nextToken;
+    }
+
+    /**
+     * <p>
+     * Paginated results marker.
+     * </p>
+     * 
+     * @param nextToken
+     *        <p>
+     *        Paginated results marker.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListConfigurationRevisionsResult withNextToken(String nextToken) {
+        setNextToken(nextToken);
+        return this;
+    }
+
+    /**
+     * <p>
+     * List of ConfigurationRevision objects.
+     * </p>
+     * 
+     * @return <p>
+     *         List of ConfigurationRevision objects.
+     *         </p>
+     */
+
+    public java.util.List<ConfigurationRevision> getRevisions() {
+        return revisions;
+    }
+
+    /**
+     * <p>
+     * List of ConfigurationRevision objects.
+     * </p>
+     * 
+     * @param revisions
+     *        <p>
+     *        List of ConfigurationRevision objects.
+     *        </p>
+     */
+
+    public void setRevisions(java.util.Collection<ConfigurationRevision> revisions) {
+        if (revisions == null) {
+            this.revisions = null;
+            return;
+        }
+
+        this.revisions = new java.util.ArrayList<ConfigurationRevision>(revisions);
+    }
+
+    /**
+     * <p>
+     * List of ConfigurationRevision objects.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setRevisions(java.util.Collection)} or {@link #withRevisions(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param revisions
+     *        <p>
+     *        List of ConfigurationRevision objects.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListConfigurationRevisionsResult withRevisions(ConfigurationRevision... revisions) {
+        if (this.revisions == null) {
+            setRevisions(new java.util.ArrayList<ConfigurationRevision>(revisions.length));
+        }
+        for (ConfigurationRevision ele : revisions) {
+            this.revisions.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * List of ConfigurationRevision objects.
+     * </p>
+     * 
+     * @param revisions
+     *        <p>
+     *        List of ConfigurationRevision objects.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListConfigurationRevisionsResult withRevisions(java.util.Collection<ConfigurationRevision> revisions) {
+        setRevisions(revisions);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getNextToken() != null)
+            sb.append("NextToken: ").append(getNextToken()).append(",");
+        if (getRevisions() != null)
+            sb.append("Revisions: ").append(getRevisions());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListConfigurationRevisionsResult == false)
+            return false;
+        ListConfigurationRevisionsResult other = (ListConfigurationRevisionsResult) obj;
+        if (other.getNextToken() == null ^ this.getNextToken() == null)
+            return false;
+        if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false)
+            return false;
+        if (other.getRevisions() == null ^ this.getRevisions() == null)
+            return false;
+        if (other.getRevisions() != null && other.getRevisions().equals(this.getRevisions()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+        hashCode = prime * hashCode + ((getRevisions() == null) ? 0 : getRevisions().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListConfigurationRevisionsResult clone() {
+        try {
+            return (ListConfigurationRevisionsResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsRequest.java
index 1e343d7c5bb9..507c3924b108 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsRequest.java
@@ -31,7 +31,7 @@ public class ListConfigurationsRequest extends com.amazonaws.AmazonWebServiceReq
      * NextToken parameter.
      * </p>
      */
-    private String maxResults;
+    private Integer maxResults;
     /**
      * <p>
      * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
@@ -47,11 +47,13 @@ public class ListConfigurationsRequest extends com.amazonaws.AmazonWebServiceReq
      * </p>
      * 
      * @param maxResults
+     *        <p>
      *        The maximum number of results to return in the response. If there are more results, the response includes
      *        a NextToken parameter.
+     *        </p>
      */
 
-    public void setMaxResults(String maxResults) {
+    public void setMaxResults(Integer maxResults) {
         this.maxResults = maxResults;
     }
 
@@ -61,11 +63,13 @@ public void setMaxResults(String maxResults) {
      * NextToken parameter.
      * </p>
      * 
-     * @return The maximum number of results to return in the response. If there are more results, the response includes
+     * @return <p>
+     *         The maximum number of results to return in the response. If there are more results, the response includes
      *         a NextToken parameter.
+     *         </p>
      */
 
-    public String getMaxResults() {
+    public Integer getMaxResults() {
         return this.maxResults;
     }
 
@@ -76,12 +80,14 @@ public String getMaxResults() {
      * </p>
      * 
      * @param maxResults
+     *        <p>
      *        The maximum number of results to return in the response. If there are more results, the response includes
      *        a NextToken parameter.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
-    public ListConfigurationsRequest withMaxResults(String maxResults) {
+    public ListConfigurationsRequest withMaxResults(Integer maxResults) {
         setMaxResults(maxResults);
         return this;
     }
@@ -93,8 +99,10 @@ public ListConfigurationsRequest withMaxResults(String maxResults) {
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
      *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
      */
 
     public void setNextToken(String nextToken) {
@@ -107,8 +115,10 @@ public void setNextToken(String nextToken) {
      * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
-     * @return The paginated results marker. When the result of the operation is truncated, the call returns NextToken
+     * @return <p>
+     *         The paginated results marker. When the result of the operation is truncated, the call returns NextToken
      *         in the response. To get the next batch, provide this token in your next request.
+     *         </p>
      */
 
     public String getNextToken() {
@@ -122,8 +132,10 @@ public String getNextToken() {
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
      *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsResult.java
index e31d16cf4891..2f50d74a18d1 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListConfigurationsResult.java
@@ -42,7 +42,9 @@ public class ListConfigurationsResult extends com.amazonaws.AmazonWebServiceResu
      * An array of MSK configurations.
      * </p>
      * 
-     * @return An array of MSK configurations.
+     * @return <p>
+     *         An array of MSK configurations.
+     *         </p>
      */
 
     public java.util.List<Configuration> getConfigurations() {
@@ -55,7 +57,9 @@ public java.util.List<Configuration> getConfigurations() {
      * </p>
      * 
      * @param configurations
+     *        <p>
      *        An array of MSK configurations.
+     *        </p>
      */
 
     public void setConfigurations(java.util.Collection<Configuration> configurations) {
@@ -71,6 +75,7 @@ public void setConfigurations(java.util.Collection<Configuration> configurations
      * <p>
      * An array of MSK configurations.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setConfigurations(java.util.Collection)} or {@link #withConfigurations(java.util.Collection)} if you want
@@ -78,7 +83,9 @@ public void setConfigurations(java.util.Collection<Configuration> configurations
      * </p>
      * 
      * @param configurations
+     *        <p>
      *        An array of MSK configurations.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -98,7 +105,9 @@ public ListConfigurationsResult withConfigurations(Configuration... configuratio
      * </p>
      * 
      * @param configurations
+     *        <p>
      *        An array of MSK configurations.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -114,9 +123,11 @@ public ListConfigurationsResult withConfigurations(java.util.Collection<Configur
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of a ListConfigurations operation is truncated, the call
      *        returns NextToken in the response. To get another batch of configurations, provide this token in your next
      *        request.
+     *        </p>
      */
 
     public void setNextToken(String nextToken) {
@@ -129,9 +140,11 @@ public void setNextToken(String nextToken) {
      * NextToken in the response. To get another batch of configurations, provide this token in your next request.
      * </p>
      * 
-     * @return The paginated results marker. When the result of a ListConfigurations operation is truncated, the call
+     * @return <p>
+     *         The paginated results marker. When the result of a ListConfigurations operation is truncated, the call
      *         returns NextToken in the response. To get another batch of configurations, provide this token in your
      *         next request.
+     *         </p>
      */
 
     public String getNextToken() {
@@ -145,9 +158,11 @@ public String getNextToken() {
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of a ListConfigurations operation is truncated, the call
      *        returns NextToken in the response. To get another batch of configurations, provide this token in your next
      *        request.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesRequest.java
index f25255215994..6812de48ebf6 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesRequest.java
@@ -33,15 +33,15 @@ public class ListNodesRequest extends com.amazonaws.AmazonWebServiceRequest impl
     private String clusterArn;
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      */
     private Integer maxResults;
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      */
     private String nextToken;
@@ -52,7 +52,9 @@ public class ListNodesRequest extends com.amazonaws.AmazonWebServiceRequest impl
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      */
 
     public void setClusterArn(String clusterArn) {
@@ -64,7 +66,9 @@ public void setClusterArn(String clusterArn) {
      * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
      */
 
     public String getClusterArn() {
@@ -77,7 +81,9 @@ public String getClusterArn() {
      * </p>
      * 
      * @param clusterArn
+     *        <p>
      *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -88,13 +94,15 @@ public ListNodesRequest withClusterArn(String clusterArn) {
 
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      * 
      * @param maxResults
-     *        The maximum number of clusters to return in the response. If there are more clusters, the response
-     *        includes a NextToken parameter.
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
      */
 
     public void setMaxResults(Integer maxResults) {
@@ -103,12 +111,14 @@ public void setMaxResults(Integer maxResults) {
 
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      * 
-     * @return The maximum number of clusters to return in the response. If there are more clusters, the response
-     *         includes a NextToken parameter.
+     * @return <p>
+     *         The maximum number of results to return in the response. If there are more results, the response includes
+     *         a NextToken parameter.
+     *         </p>
      */
 
     public Integer getMaxResults() {
@@ -117,13 +127,15 @@ public Integer getMaxResults() {
 
     /**
      * <p>
-     * The maximum number of clusters to return in the response. If there are more clusters, the response includes a
+     * The maximum number of results to return in the response. If there are more results, the response includes a
      * NextToken parameter.
      * </p>
      * 
      * @param maxResults
-     *        The maximum number of clusters to return in the response. If there are more clusters, the response
-     *        includes a NextToken parameter.
+     *        <p>
+     *        The maximum number of results to return in the response. If there are more results, the response includes
+     *        a NextToken parameter.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -134,13 +146,15 @@ public ListNodesRequest withMaxResults(Integer maxResults) {
 
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
      * @param nextToken
-     *        The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     *        NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
      */
 
     public void setNextToken(String nextToken) {
@@ -149,12 +163,14 @@ public void setNextToken(String nextToken) {
 
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
-     * @return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     *         NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * @return <p>
+     *         The paginated results marker. When the result of the operation is truncated, the call returns NextToken
+     *         in the response. To get the next batch, provide this token in your next request.
+     *         </p>
      */
 
     public String getNextToken() {
@@ -163,13 +179,15 @@ public String getNextToken() {
 
     /**
      * <p>
-     * The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     * NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     * The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the
+     * response. To get the next batch, provide this token in your next request.
      * </p>
      * 
      * @param nextToken
-     *        The paginated results marker. When the result of a ListClusters operation is truncated, the call returns
-     *        NextToken in the response. To get another batch of clusters, provide this token in your next request.
+     *        <p>
+     *        The paginated results marker. When the result of the operation is truncated, the call returns NextToken in
+     *        the response. To get the next batch, provide this token in your next request.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesResult.java
index a6a129ec8fe8..cd270a44e0b6 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListNodesResult.java
@@ -44,8 +44,10 @@ public class ListNodesResult extends com.amazonaws.AmazonWebServiceResult<com.am
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of a ListNodes operation is truncated, the call returns
      *        NextToken in the response. To get another batch of nodes, provide this token in your next request.
+     *        </p>
      */
 
     public void setNextToken(String nextToken) {
@@ -58,8 +60,10 @@ public void setNextToken(String nextToken) {
      * in the response. To get another batch of nodes, provide this token in your next request.
      * </p>
      * 
-     * @return The paginated results marker. When the result of a ListNodes operation is truncated, the call returns
+     * @return <p>
+     *         The paginated results marker. When the result of a ListNodes operation is truncated, the call returns
      *         NextToken in the response. To get another batch of nodes, provide this token in your next request.
+     *         </p>
      */
 
     public String getNextToken() {
@@ -73,8 +77,10 @@ public String getNextToken() {
      * </p>
      * 
      * @param nextToken
+     *        <p>
      *        The paginated results marker. When the result of a ListNodes operation is truncated, the call returns
      *        NextToken in the response. To get another batch of nodes, provide this token in your next request.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -88,7 +94,9 @@ public ListNodesResult withNextToken(String nextToken) {
      * List containing a NodeInfo object.
      * </p>
      * 
-     * @return List containing a NodeInfo object.
+     * @return <p>
+     *         List containing a NodeInfo object.
+     *         </p>
      */
 
     public java.util.List<NodeInfo> getNodeInfoList() {
@@ -101,7 +109,9 @@ public java.util.List<NodeInfo> getNodeInfoList() {
      * </p>
      * 
      * @param nodeInfoList
+     *        <p>
      *        List containing a NodeInfo object.
+     *        </p>
      */
 
     public void setNodeInfoList(java.util.Collection<NodeInfo> nodeInfoList) {
@@ -117,6 +127,7 @@ public void setNodeInfoList(java.util.Collection<NodeInfo> nodeInfoList) {
      * <p>
      * List containing a NodeInfo object.
      * </p>
+     * 
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setNodeInfoList(java.util.Collection)} or {@link #withNodeInfoList(java.util.Collection)} if you want to
@@ -124,7 +135,9 @@ public void setNodeInfoList(java.util.Collection<NodeInfo> nodeInfoList) {
      * </p>
      * 
      * @param nodeInfoList
+     *        <p>
      *        List containing a NodeInfo object.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -144,7 +157,9 @@ public ListNodesResult withNodeInfoList(NodeInfo... nodeInfoList) {
      * </p>
      * 
      * @param nodeInfoList
+     *        <p>
      *        List containing a NodeInfo object.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceRequest.java
index 959498c5a716..a1dd2a93d821 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceRequest.java
@@ -27,18 +27,20 @@ public class ListTagsForResourceRequest extends com.amazonaws.AmazonWebServiceRe
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      */
     private String resourceArn;
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
      * @param resourceArn
-     *        The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *        </p>
      */
 
     public void setResourceArn(String resourceArn) {
@@ -47,10 +49,12 @@ public void setResourceArn(String resourceArn) {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *         </p>
      */
 
     public String getResourceArn() {
@@ -59,11 +63,13 @@ public String getResourceArn() {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
      * @param resourceArn
-     *        The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceResult.java
index b4e91e906588..81087ff65797 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceResult.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ListTagsForResourceResult.java
@@ -25,17 +25,19 @@ public class ListTagsForResourceResult extends com.amazonaws.AmazonWebServiceRes
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      */
     private java.util.Map<String, String> tags;
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      * 
-     * @return The key-value pairs for the resource tags
+     * @return <p>
+     *         The key-value pair for the resource tag.
+     *         </p>
      */
 
     public java.util.Map<String, String> getTags() {
@@ -44,11 +46,13 @@ public java.util.Map<String, String> getTags() {
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      * 
      * @param tags
-     *        The key-value pairs for the resource tags
+     *        <p>
+     *        The key-value pair for the resource tag.
+     *        </p>
      */
 
     public void setTags(java.util.Map<String, String> tags) {
@@ -57,11 +61,13 @@ public void setTags(java.util.Map<String, String> tags) {
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      * 
      * @param tags
-     *        The key-value pairs for the resource tags
+     *        <p>
+     *        The key-value pair for the resource tag.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/MutableClusterInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/MutableClusterInfo.java
new file mode 100644
index 000000000000..2195d64f0b67
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/MutableClusterInfo.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * Information about cluster attributes that can be updated via update APIs.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/MutableClusterInfo" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class MutableClusterInfo implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Specifies the size of the EBS volume and the ID of the associated broker.
+     * </p>
+     */
+    private java.util.List<BrokerEBSVolumeInfo> brokerEBSVolumeInfo;
+    /**
+     * <p>
+     * Information about the changes in the configuration of the brokers.
+     * </p>
+     */
+    private ConfigurationInfo configurationInfo;
+    /**
+     * <p>
+     * The number of broker nodes in the cluster.
+     * </p>
+     */
+    private Integer numberOfBrokerNodes;
+
+    /**
+     * <p>
+     * Specifies the size of the EBS volume and the ID of the associated broker.
+     * </p>
+     * 
+     * @return <p>
+     *         Specifies the size of the EBS volume and the ID of the associated broker.
+     *         </p>
+     */
+
+    public java.util.List<BrokerEBSVolumeInfo> getBrokerEBSVolumeInfo() {
+        return brokerEBSVolumeInfo;
+    }
+
+    /**
+     * <p>
+     * Specifies the size of the EBS volume and the ID of the associated broker.
+     * </p>
+     * 
+     * @param brokerEBSVolumeInfo
+     *        <p>
+     *        Specifies the size of the EBS volume and the ID of the associated broker.
+     *        </p>
+     */
+
+    public void setBrokerEBSVolumeInfo(java.util.Collection<BrokerEBSVolumeInfo> brokerEBSVolumeInfo) {
+        if (brokerEBSVolumeInfo == null) {
+            this.brokerEBSVolumeInfo = null;
+            return;
+        }
+
+        this.brokerEBSVolumeInfo = new java.util.ArrayList<BrokerEBSVolumeInfo>(brokerEBSVolumeInfo);
+    }
+
+    /**
+     * <p>
+     * Specifies the size of the EBS volume and the ID of the associated broker.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setBrokerEBSVolumeInfo(java.util.Collection)} or {@link #withBrokerEBSVolumeInfo(java.util.Collection)}
+     * if you want to override the existing values.
+     * </p>
+     * 
+     * @param brokerEBSVolumeInfo
+     *        <p>
+     *        Specifies the size of the EBS volume and the ID of the associated broker.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public MutableClusterInfo withBrokerEBSVolumeInfo(BrokerEBSVolumeInfo... brokerEBSVolumeInfo) {
+        if (this.brokerEBSVolumeInfo == null) {
+            setBrokerEBSVolumeInfo(new java.util.ArrayList<BrokerEBSVolumeInfo>(brokerEBSVolumeInfo.length));
+        }
+        for (BrokerEBSVolumeInfo ele : brokerEBSVolumeInfo) {
+            this.brokerEBSVolumeInfo.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the size of the EBS volume and the ID of the associated broker.
+     * </p>
+     * 
+     * @param brokerEBSVolumeInfo
+     *        <p>
+     *        Specifies the size of the EBS volume and the ID of the associated broker.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public MutableClusterInfo withBrokerEBSVolumeInfo(java.util.Collection<BrokerEBSVolumeInfo> brokerEBSVolumeInfo) {
+        setBrokerEBSVolumeInfo(brokerEBSVolumeInfo);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Information about the changes in the configuration of the brokers.
+     * </p>
+     * 
+     * @param configurationInfo
+     *        <p>
+     *        Information about the changes in the configuration of the brokers.
+     *        </p>
+     */
+
+    public void setConfigurationInfo(ConfigurationInfo configurationInfo) {
+        this.configurationInfo = configurationInfo;
+    }
+
+    /**
+     * <p>
+     * Information about the changes in the configuration of the brokers.
+     * </p>
+     * 
+     * @return <p>
+     *         Information about the changes in the configuration of the brokers.
+     *         </p>
+     */
+
+    public ConfigurationInfo getConfigurationInfo() {
+        return this.configurationInfo;
+    }
+
+    /**
+     * <p>
+     * Information about the changes in the configuration of the brokers.
+     * </p>
+     * 
+     * @param configurationInfo
+     *        <p>
+     *        Information about the changes in the configuration of the brokers.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public MutableClusterInfo withConfigurationInfo(ConfigurationInfo configurationInfo) {
+        setConfigurationInfo(configurationInfo);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The number of broker nodes in the cluster.
+     * </p>
+     * 
+     * @param numberOfBrokerNodes
+     *        <p>
+     *        The number of broker nodes in the cluster.
+     *        </p>
+     */
+
+    public void setNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
+        this.numberOfBrokerNodes = numberOfBrokerNodes;
+    }
+
+    /**
+     * <p>
+     * The number of broker nodes in the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         The number of broker nodes in the cluster.
+     *         </p>
+     */
+
+    public Integer getNumberOfBrokerNodes() {
+        return this.numberOfBrokerNodes;
+    }
+
+    /**
+     * <p>
+     * The number of broker nodes in the cluster.
+     * </p>
+     * 
+     * @param numberOfBrokerNodes
+     *        <p>
+     *        The number of broker nodes in the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public MutableClusterInfo withNumberOfBrokerNodes(Integer numberOfBrokerNodes) {
+        setNumberOfBrokerNodes(numberOfBrokerNodes);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBrokerEBSVolumeInfo() != null)
+            sb.append("BrokerEBSVolumeInfo: ").append(getBrokerEBSVolumeInfo()).append(",");
+        if (getConfigurationInfo() != null)
+            sb.append("ConfigurationInfo: ").append(getConfigurationInfo()).append(",");
+        if (getNumberOfBrokerNodes() != null)
+            sb.append("NumberOfBrokerNodes: ").append(getNumberOfBrokerNodes());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof MutableClusterInfo == false)
+            return false;
+        MutableClusterInfo other = (MutableClusterInfo) obj;
+        if (other.getBrokerEBSVolumeInfo() == null ^ this.getBrokerEBSVolumeInfo() == null)
+            return false;
+        if (other.getBrokerEBSVolumeInfo() != null && other.getBrokerEBSVolumeInfo().equals(this.getBrokerEBSVolumeInfo()) == false)
+            return false;
+        if (other.getConfigurationInfo() == null ^ this.getConfigurationInfo() == null)
+            return false;
+        if (other.getConfigurationInfo() != null && other.getConfigurationInfo().equals(this.getConfigurationInfo()) == false)
+            return false;
+        if (other.getNumberOfBrokerNodes() == null ^ this.getNumberOfBrokerNodes() == null)
+            return false;
+        if (other.getNumberOfBrokerNodes() != null && other.getNumberOfBrokerNodes().equals(this.getNumberOfBrokerNodes()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBrokerEBSVolumeInfo() == null) ? 0 : getBrokerEBSVolumeInfo().hashCode());
+        hashCode = prime * hashCode + ((getConfigurationInfo() == null) ? 0 : getConfigurationInfo().hashCode());
+        hashCode = prime * hashCode + ((getNumberOfBrokerNodes() == null) ? 0 : getNumberOfBrokerNodes().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public MutableClusterInfo clone() {
+        try {
+            return (MutableClusterInfo) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.MutableClusterInfoMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeInfo.java
index 830a6383f56c..b5d238619073 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * The node information object.
  * </p>
  * 
@@ -71,7 +72,9 @@ public class NodeInfo implements Serializable, Cloneable, StructuredPojo {
      * </p>
      * 
      * @param addedToClusterTime
+     *        <p>
      *        The start time.
+     *        </p>
      */
 
     public void setAddedToClusterTime(String addedToClusterTime) {
@@ -83,7 +86,9 @@ public void setAddedToClusterTime(String addedToClusterTime) {
      * The start time.
      * </p>
      * 
-     * @return The start time.
+     * @return <p>
+     *         The start time.
+     *         </p>
      */
 
     public String getAddedToClusterTime() {
@@ -96,7 +101,9 @@ public String getAddedToClusterTime() {
      * </p>
      * 
      * @param addedToClusterTime
+     *        <p>
      *        The start time.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -111,7 +118,9 @@ public NodeInfo withAddedToClusterTime(String addedToClusterTime) {
      * </p>
      * 
      * @param brokerNodeInfo
+     *        <p>
      *        The broker node info.
+     *        </p>
      */
 
     public void setBrokerNodeInfo(BrokerNodeInfo brokerNodeInfo) {
@@ -123,7 +132,9 @@ public void setBrokerNodeInfo(BrokerNodeInfo brokerNodeInfo) {
      * The broker node info.
      * </p>
      * 
-     * @return The broker node info.
+     * @return <p>
+     *         The broker node info.
+     *         </p>
      */
 
     public BrokerNodeInfo getBrokerNodeInfo() {
@@ -136,7 +147,9 @@ public BrokerNodeInfo getBrokerNodeInfo() {
      * </p>
      * 
      * @param brokerNodeInfo
+     *        <p>
      *        The broker node info.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -151,7 +164,9 @@ public NodeInfo withBrokerNodeInfo(BrokerNodeInfo brokerNodeInfo) {
      * </p>
      * 
      * @param instanceType
+     *        <p>
      *        The instance type.
+     *        </p>
      */
 
     public void setInstanceType(String instanceType) {
@@ -163,7 +178,9 @@ public void setInstanceType(String instanceType) {
      * The instance type.
      * </p>
      * 
-     * @return The instance type.
+     * @return <p>
+     *         The instance type.
+     *         </p>
      */
 
     public String getInstanceType() {
@@ -176,7 +193,9 @@ public String getInstanceType() {
      * </p>
      * 
      * @param instanceType
+     *        <p>
      *        The instance type.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -191,7 +210,9 @@ public NodeInfo withInstanceType(String instanceType) {
      * </p>
      * 
      * @param nodeARN
+     *        <p>
      *        The Amazon Resource Name (ARN) of the node.
+     *        </p>
      */
 
     public void setNodeARN(String nodeARN) {
@@ -203,7 +224,9 @@ public void setNodeARN(String nodeARN) {
      * The Amazon Resource Name (ARN) of the node.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) of the node.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the node.
+     *         </p>
      */
 
     public String getNodeARN() {
@@ -216,7 +239,9 @@ public String getNodeARN() {
      * </p>
      * 
      * @param nodeARN
+     *        <p>
      *        The Amazon Resource Name (ARN) of the node.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -231,7 +256,9 @@ public NodeInfo withNodeARN(String nodeARN) {
      * </p>
      * 
      * @param nodeType
+     *        <p>
      *        The node type.
+     *        </p>
      * @see NodeType
      */
 
@@ -244,7 +271,9 @@ public void setNodeType(String nodeType) {
      * The node type.
      * </p>
      * 
-     * @return The node type.
+     * @return <p>
+     *         The node type.
+     *         </p>
      * @see NodeType
      */
 
@@ -258,7 +287,9 @@ public String getNodeType() {
      * </p>
      * 
      * @param nodeType
+     *        <p>
      *        The node type.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see NodeType
      */
@@ -274,7 +305,9 @@ public NodeInfo withNodeType(String nodeType) {
      * </p>
      * 
      * @param nodeType
+     *        <p>
      *        The node type.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      * @see NodeType
      */
@@ -290,7 +323,9 @@ public NodeInfo withNodeType(NodeType nodeType) {
      * </p>
      * 
      * @param zookeeperNodeInfo
+     *        <p>
      *        The ZookeeperNodeInfo.
+     *        </p>
      */
 
     public void setZookeeperNodeInfo(ZookeeperNodeInfo zookeeperNodeInfo) {
@@ -302,7 +337,9 @@ public void setZookeeperNodeInfo(ZookeeperNodeInfo zookeeperNodeInfo) {
      * The ZookeeperNodeInfo.
      * </p>
      * 
-     * @return The ZookeeperNodeInfo.
+     * @return <p>
+     *         The ZookeeperNodeInfo.
+     *         </p>
      */
 
     public ZookeeperNodeInfo getZookeeperNodeInfo() {
@@ -315,7 +352,9 @@ public ZookeeperNodeInfo getZookeeperNodeInfo() {
      * </p>
      * 
      * @param zookeeperNodeInfo
+     *        <p>
      *        The ZookeeperNodeInfo.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeType.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeType.java
index 852e263e6468..4e157a5ebd09 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeType.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NodeType.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * The broker or Zookeeper node.
  * </p>
  */
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NotFoundException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NotFoundException.java
index 46625310e111..f916f98975ae 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NotFoundException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/NotFoundException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public NotFoundException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ServiceUnavailableException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ServiceUnavailableException.java
index 572ed2122f9e..1e99682af229 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ServiceUnavailableException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ServiceUnavailableException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public ServiceUnavailableException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/StorageInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/StorageInfo.java
index c2831106c354..da0c893bff29 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/StorageInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/StorageInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Contains information about storage volumes attached to MSK broker nodes.
  * </p>
  * 
@@ -41,7 +42,9 @@ public class StorageInfo implements Serializable, Cloneable, StructuredPojo {
      * </p>
      * 
      * @param ebsStorageInfo
+     *        <p>
      *        EBS volume information.
+     *        </p>
      */
 
     public void setEbsStorageInfo(EBSStorageInfo ebsStorageInfo) {
@@ -53,7 +56,9 @@ public void setEbsStorageInfo(EBSStorageInfo ebsStorageInfo) {
      * EBS volume information.
      * </p>
      * 
-     * @return EBS volume information.
+     * @return <p>
+     *         EBS volume information.
+     *         </p>
      */
 
     public EBSStorageInfo getEbsStorageInfo() {
@@ -66,7 +71,9 @@ public EBSStorageInfo getEbsStorageInfo() {
      * </p>
      * 
      * @param ebsStorageInfo
+     *        <p>
      *        EBS volume information.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TagResourceRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TagResourceRequest.java
index d247c4208b22..a3e8b08201a9 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TagResourceRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TagResourceRequest.java
@@ -27,24 +27,26 @@ public class TagResourceRequest extends com.amazonaws.AmazonWebServiceRequest im
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      */
     private String resourceArn;
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      */
     private java.util.Map<String, String> tags;
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
      * @param resourceArn
-     *        The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *        </p>
      */
 
     public void setResourceArn(String resourceArn) {
@@ -53,10 +55,12 @@ public void setResourceArn(String resourceArn) {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *         </p>
      */
 
     public String getResourceArn() {
@@ -65,11 +69,13 @@ public String getResourceArn() {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
      * @param resourceArn
-     *        The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -80,10 +86,12 @@ public TagResourceRequest withResourceArn(String resourceArn) {
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      * 
-     * @return The key-value pairs for the resource tags
+     * @return <p>
+     *         The key-value pair for the resource tag.
+     *         </p>
      */
 
     public java.util.Map<String, String> getTags() {
@@ -92,11 +100,13 @@ public java.util.Map<String, String> getTags() {
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      * 
      * @param tags
-     *        The key-value pairs for the resource tags
+     *        <p>
+     *        The key-value pair for the resource tag.
+     *        </p>
      */
 
     public void setTags(java.util.Map<String, String> tags) {
@@ -105,11 +115,13 @@ public void setTags(java.util.Map<String, String> tags) {
 
     /**
      * <p>
-     * The key-value pairs for the resource tags
+     * The key-value pair for the resource tag.
      * </p>
      * 
      * @param tags
-     *        The key-value pairs for the resource tags
+     *        <p>
+     *        The key-value pair for the resource tag.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Tls.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Tls.java
new file mode 100644
index 000000000000..258ffb7c81f1
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/Tls.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * 
+ <p>
+ * Details for client authentication using TLS.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/Tls" target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Tls implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * List of ACM Certificate Authority ARNs.
+     * </p>
+     */
+    private java.util.List<String> certificateAuthorityArnList;
+
+    /**
+     * <p>
+     * List of ACM Certificate Authority ARNs.
+     * </p>
+     * 
+     * @return <p>
+     *         List of ACM Certificate Authority ARNs.
+     *         </p>
+     */
+
+    public java.util.List<String> getCertificateAuthorityArnList() {
+        return certificateAuthorityArnList;
+    }
+
+    /**
+     * <p>
+     * List of ACM Certificate Authority ARNs.
+     * </p>
+     * 
+     * @param certificateAuthorityArnList
+     *        <p>
+     *        List of ACM Certificate Authority ARNs.
+     *        </p>
+     */
+
+    public void setCertificateAuthorityArnList(java.util.Collection<String> certificateAuthorityArnList) {
+        if (certificateAuthorityArnList == null) {
+            this.certificateAuthorityArnList = null;
+            return;
+        }
+
+        this.certificateAuthorityArnList = new java.util.ArrayList<String>(certificateAuthorityArnList);
+    }
+
+    /**
+     * <p>
+     * List of ACM Certificate Authority ARNs.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setCertificateAuthorityArnList(java.util.Collection)} or
+     * {@link #withCertificateAuthorityArnList(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param certificateAuthorityArnList
+     *        <p>
+     *        List of ACM Certificate Authority ARNs.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Tls withCertificateAuthorityArnList(String... certificateAuthorityArnList) {
+        if (this.certificateAuthorityArnList == null) {
+            setCertificateAuthorityArnList(new java.util.ArrayList<String>(certificateAuthorityArnList.length));
+        }
+        for (String ele : certificateAuthorityArnList) {
+            this.certificateAuthorityArnList.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * List of ACM Certificate Authority ARNs.
+     * </p>
+     * 
+     * @param certificateAuthorityArnList
+     *        <p>
+     *        List of ACM Certificate Authority ARNs.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Tls withCertificateAuthorityArnList(java.util.Collection<String> certificateAuthorityArnList) {
+        setCertificateAuthorityArnList(certificateAuthorityArnList);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getCertificateAuthorityArnList() != null)
+            sb.append("CertificateAuthorityArnList: ").append(getCertificateAuthorityArnList());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Tls == false)
+            return false;
+        Tls other = (Tls) obj;
+        if (other.getCertificateAuthorityArnList() == null ^ this.getCertificateAuthorityArnList() == null)
+            return false;
+        if (other.getCertificateAuthorityArnList() != null && other.getCertificateAuthorityArnList().equals(this.getCertificateAuthorityArnList()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getCertificateAuthorityArnList() == null) ? 0 : getCertificateAuthorityArnList().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Tls clone() {
+        try {
+            return (Tls) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.kafka.model.transform.TlsMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TooManyRequestsException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TooManyRequestsException.java
index 8728011bf1fa..438ebb0d585a 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TooManyRequestsException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/TooManyRequestsException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public TooManyRequestsException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UnauthorizedException.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UnauthorizedException.java
index f0dbafdc80fb..7246e3bbbed1 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UnauthorizedException.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UnauthorizedException.java
@@ -15,7 +15,8 @@
 import javax.annotation.Generated;
 
 /**
- * <p>
+ * 
+ <p>
  * Returns information about an error.
  * </p>
  */
@@ -46,7 +47,9 @@ public UnauthorizedException(String message) {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -59,7 +62,9 @@ public void setInvalidParameter(String invalidParameter) {
      * The parameter that caused the error.
      * </p>
      * 
-     * @return The parameter that caused the error.
+     * @return <p>
+     *         The parameter that caused the error.
+     *         </p>
      */
 
     @com.fasterxml.jackson.annotation.JsonProperty("invalidParameter")
@@ -73,7 +78,9 @@ public String getInvalidParameter() {
      * </p>
      * 
      * @param invalidParameter
+     *        <p>
      *        The parameter that caused the error.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UntagResourceRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UntagResourceRequest.java
index 579b3057b6c0..f4d8ff402df1 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UntagResourceRequest.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UntagResourceRequest.java
@@ -27,24 +27,51 @@ public class UntagResourceRequest extends com.amazonaws.AmazonWebServiceRequest
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      */
     private String resourceArn;
     /**
      * <p>
-     * The list of tag keys.
+     * Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
      * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites the
+     * existing key-value pair.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that begin
+     * with this prefix on your behalf, but you can't edit or delete them.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must be between 1 and 128 Unicode characters in length.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     * special characters: _ . / = + -
+     * 
+     * @.</p> </li>
+     *        </ul>
      */
     private java.util.List<String> tagKeys;
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
      * @param resourceArn
-     *        The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *        </p>
      */
 
     public void setResourceArn(String resourceArn) {
@@ -53,10 +80,12 @@ public void setResourceArn(String resourceArn) {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
-     * @return The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *         </p>
      */
 
     public String getResourceArn() {
@@ -65,11 +94,13 @@ public String getResourceArn() {
 
     /**
      * <p>
-     * The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     * The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
      * </p>
      * 
      * @param resourceArn
-     *        The Amazon Resource Name (ARN) that uniquely identifies the resource.
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -80,10 +111,60 @@ public UntagResourceRequest withResourceArn(String resourceArn) {
 
     /**
      * <p>
-     * The list of tag keys.
+     * Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites the
+     * existing key-value pair.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that begin
+     * with this prefix on your behalf, but you can't edit or delete them.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must be between 1 and 128 Unicode characters in length.
      * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     * special characters: _ . / = + -
      * 
-     * @return The list of tag keys.
+     * @.</p> </li>
+     *        </ul>
+     * @return <p>
+     *         Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     *         </p>
+     *         <ul>
+     *         <li>
+     *         <p>
+     *         Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites
+     *         the existing key-value pair.
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that
+     *         begin with this prefix on your behalf, but you can't edit or delete them.
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         Tag keys must be between 1 and 128 Unicode characters in length.
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         Tag keys must consist of the following characters: Unicode letters, digits, white space, and the
+     *         following special characters: _ . / = + -
+     * @.</p> </li>
+     *        </ul>
      */
 
     public java.util.List<String> getTagKeys() {
@@ -92,11 +173,61 @@ public java.util.List<String> getTagKeys() {
 
     /**
      * <p>
-     * The list of tag keys.
+     * Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites the
+     * existing key-value pair.
      * </p>
+     * </li>
+     * <li>
+     * <p>
+     * You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that begin
+     * with this prefix on your behalf, but you can't edit or delete them.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must be between 1 and 128 Unicode characters in length.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     * special characters: _ . / = + -
      * 
+     * @.</p> </li>
+     *        </ul>
      * @param tagKeys
-     *        The list of tag keys.
+     *        <p>
+     *        Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     *        </p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites
+     *        the existing key-value pair.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that
+     *        begin with this prefix on your behalf, but you can't edit or delete them.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        Tag keys must be between 1 and 128 Unicode characters in length.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     *        special characters: _ . / = + -
+     * @.</p> </li>
+     *        </ul>
      */
 
     public void setTagKeys(java.util.Collection<String> tagKeys) {
@@ -110,16 +241,67 @@ public void setTagKeys(java.util.Collection<String> tagKeys) {
 
     /**
      * <p>
-     * The list of tag keys.
+     * Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
      * </p>
+     * <ul>
+     * <li>
      * <p>
-     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
-     * {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override
-     * the existing values.
+     * Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites the
+     * existing key-value pair.
      * </p>
+     * </li>
+     * <li>
+     * <p>
+     * You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that begin
+     * with this prefix on your behalf, but you can't edit or delete them.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must be between 1 and 128 Unicode characters in length.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     * special characters: _ . / = + -
      * 
+     * @.</p> </li>
+     *        </ul>
+     * 
+     *        <p>
+     *        <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     *        {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to
+     *        override the existing values.
+     *        </p>
      * @param tagKeys
-     *        The list of tag keys.
+     *        <p>
+     *        Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     *        </p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites
+     *        the existing key-value pair.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that
+     *        begin with this prefix on your behalf, but you can't edit or delete them.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        Tag keys must be between 1 and 128 Unicode characters in length.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     *        special characters: _ . / = + -
+     * @.</p> </li>
+     *        </ul>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -135,11 +317,61 @@ public UntagResourceRequest withTagKeys(String... tagKeys) {
 
     /**
      * <p>
-     * The list of tag keys.
+     * Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites the
+     * existing key-value pair.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that begin
+     * with this prefix on your behalf, but you can't edit or delete them.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must be between 1 and 128 Unicode characters in length.
      * </p>
+     * </li>
+     * <li>
+     * <p>
+     * Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     * special characters: _ . / = + -
      * 
+     * @.</p> </li>
+     *        </ul>
      * @param tagKeys
-     *        The list of tag keys.
+     *        <p>
+     *        Tag keys must be unique for a given cluster. In addition, the following restrictions apply:
+     *        </p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        Each tag key must be unique. If you add a tag with a key that's already in use, your new tag overwrites
+     *        the existing key-value pair.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        You can't start a tag key with aws: because this prefix is reserved for use by AWS. AWS creates tags that
+     *        begin with this prefix on your behalf, but you can't edit or delete them.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        Tag keys must be between 1 and 128 Unicode characters in length.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        Tag keys must consist of the following characters: Unicode letters, digits, white space, and the following
+     *        special characters: _ . / = + -
+     * @.</p> </li>
+     *        </ul>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateBrokerStorageRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateBrokerStorageRequest.java
new file mode 100644
index 000000000000..249bc847206d
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateBrokerStorageRequest.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerStorage" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateBrokerStorageRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     */
+    private String clusterArn;
+    /**
+     * <p>
+     * The version of cluster to update from. A successful operation will then generate a new version.
+     * </p>
+     */
+    private String currentVersion;
+    /**
+     * <p>
+     * Describes the target volume size and the ID of the broker to apply the update to.
+     * </p>
+     */
+    private java.util.List<BrokerEBSVolumeInfo> targetBrokerEBSVolumeInfo;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
+     */
+
+    public void setClusterArn(String clusterArn) {
+        this.clusterArn = clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
+     */
+
+    public String getClusterArn() {
+        return this.clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateBrokerStorageRequest withClusterArn(String clusterArn) {
+        setClusterArn(clusterArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The version of cluster to update from. A successful operation will then generate a new version.
+     * </p>
+     * 
+     * @param currentVersion
+     *        <p>
+     *        The version of cluster to update from. A successful operation will then generate a new version.
+     *        </p>
+     */
+
+    public void setCurrentVersion(String currentVersion) {
+        this.currentVersion = currentVersion;
+    }
+
+    /**
+     * <p>
+     * The version of cluster to update from. A successful operation will then generate a new version.
+     * </p>
+     * 
+     * @return <p>
+     *         The version of cluster to update from. A successful operation will then generate a new version.
+     *         </p>
+     */
+
+    public String getCurrentVersion() {
+        return this.currentVersion;
+    }
+
+    /**
+     * <p>
+     * The version of cluster to update from. A successful operation will then generate a new version.
+     * </p>
+     * 
+     * @param currentVersion
+     *        <p>
+     *        The version of cluster to update from. A successful operation will then generate a new version.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateBrokerStorageRequest withCurrentVersion(String currentVersion) {
+        setCurrentVersion(currentVersion);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Describes the target volume size and the ID of the broker to apply the update to.
+     * </p>
+     * 
+     * @return <p>
+     *         Describes the target volume size and the ID of the broker to apply the update to.
+     *         </p>
+     */
+
+    public java.util.List<BrokerEBSVolumeInfo> getTargetBrokerEBSVolumeInfo() {
+        return targetBrokerEBSVolumeInfo;
+    }
+
+    /**
+     * <p>
+     * Describes the target volume size and the ID of the broker to apply the update to.
+     * </p>
+     * 
+     * @param targetBrokerEBSVolumeInfo
+     *        <p>
+     *        Describes the target volume size and the ID of the broker to apply the update to.
+     *        </p>
+     */
+
+    public void setTargetBrokerEBSVolumeInfo(java.util.Collection<BrokerEBSVolumeInfo> targetBrokerEBSVolumeInfo) {
+        if (targetBrokerEBSVolumeInfo == null) {
+            this.targetBrokerEBSVolumeInfo = null;
+            return;
+        }
+
+        this.targetBrokerEBSVolumeInfo = new java.util.ArrayList<BrokerEBSVolumeInfo>(targetBrokerEBSVolumeInfo);
+    }
+
+    /**
+     * <p>
+     * Describes the target volume size and the ID of the broker to apply the update to.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setTargetBrokerEBSVolumeInfo(java.util.Collection)} or
+     * {@link #withTargetBrokerEBSVolumeInfo(java.util.Collection)} if you want to override the existing values.
+     * </p>
+     * 
+     * @param targetBrokerEBSVolumeInfo
+     *        <p>
+     *        Describes the target volume size and the ID of the broker to apply the update to.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateBrokerStorageRequest withTargetBrokerEBSVolumeInfo(BrokerEBSVolumeInfo... targetBrokerEBSVolumeInfo) {
+        if (this.targetBrokerEBSVolumeInfo == null) {
+            setTargetBrokerEBSVolumeInfo(new java.util.ArrayList<BrokerEBSVolumeInfo>(targetBrokerEBSVolumeInfo.length));
+        }
+        for (BrokerEBSVolumeInfo ele : targetBrokerEBSVolumeInfo) {
+            this.targetBrokerEBSVolumeInfo.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Describes the target volume size and the ID of the broker to apply the update to.
+     * </p>
+     * 
+     * @param targetBrokerEBSVolumeInfo
+     *        <p>
+     *        Describes the target volume size and the ID of the broker to apply the update to.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateBrokerStorageRequest withTargetBrokerEBSVolumeInfo(java.util.Collection<BrokerEBSVolumeInfo> targetBrokerEBSVolumeInfo) {
+        setTargetBrokerEBSVolumeInfo(targetBrokerEBSVolumeInfo);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterArn() != null)
+            sb.append("ClusterArn: ").append(getClusterArn()).append(",");
+        if (getCurrentVersion() != null)
+            sb.append("CurrentVersion: ").append(getCurrentVersion()).append(",");
+        if (getTargetBrokerEBSVolumeInfo() != null)
+            sb.append("TargetBrokerEBSVolumeInfo: ").append(getTargetBrokerEBSVolumeInfo());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateBrokerStorageRequest == false)
+            return false;
+        UpdateBrokerStorageRequest other = (UpdateBrokerStorageRequest) obj;
+        if (other.getClusterArn() == null ^ this.getClusterArn() == null)
+            return false;
+        if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
+            return false;
+        if (other.getCurrentVersion() == null ^ this.getCurrentVersion() == null)
+            return false;
+        if (other.getCurrentVersion() != null && other.getCurrentVersion().equals(this.getCurrentVersion()) == false)
+            return false;
+        if (other.getTargetBrokerEBSVolumeInfo() == null ^ this.getTargetBrokerEBSVolumeInfo() == null)
+            return false;
+        if (other.getTargetBrokerEBSVolumeInfo() != null && other.getTargetBrokerEBSVolumeInfo().equals(this.getTargetBrokerEBSVolumeInfo()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
+        hashCode = prime * hashCode + ((getCurrentVersion() == null) ? 0 : getCurrentVersion().hashCode());
+        hashCode = prime * hashCode + ((getTargetBrokerEBSVolumeInfo() == null) ? 0 : getTargetBrokerEBSVolumeInfo().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateBrokerStorageRequest clone() {
+        return (UpdateBrokerStorageRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateBrokerStorageResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateBrokerStorageResult.java
new file mode 100644
index 000000000000..785fffd07a2a
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateBrokerStorageResult.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerStorage" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateBrokerStorageResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     */
+    private String clusterArn;
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     */
+    private String clusterOperationArn;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
+     */
+
+    public void setClusterArn(String clusterArn) {
+        this.clusterArn = clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the cluster.
+     *         </p>
+     */
+
+    public String getClusterArn() {
+        return this.clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateBrokerStorageResult withClusterArn(String clusterArn) {
+        setClusterArn(clusterArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     * 
+     * @param clusterOperationArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster operation.
+     *        </p>
+     */
+
+    public void setClusterOperationArn(String clusterOperationArn) {
+        this.clusterOperationArn = clusterOperationArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the cluster operation.
+     *         </p>
+     */
+
+    public String getClusterOperationArn() {
+        return this.clusterOperationArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     * 
+     * @param clusterOperationArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateBrokerStorageResult withClusterOperationArn(String clusterOperationArn) {
+        setClusterOperationArn(clusterOperationArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterArn() != null)
+            sb.append("ClusterArn: ").append(getClusterArn()).append(",");
+        if (getClusterOperationArn() != null)
+            sb.append("ClusterOperationArn: ").append(getClusterOperationArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateBrokerStorageResult == false)
+            return false;
+        UpdateBrokerStorageResult other = (UpdateBrokerStorageResult) obj;
+        if (other.getClusterArn() == null ^ this.getClusterArn() == null)
+            return false;
+        if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
+            return false;
+        if (other.getClusterOperationArn() == null ^ this.getClusterOperationArn() == null)
+            return false;
+        if (other.getClusterOperationArn() != null && other.getClusterOperationArn().equals(this.getClusterOperationArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
+        hashCode = prime * hashCode + ((getClusterOperationArn() == null) ? 0 : getClusterOperationArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateBrokerStorageResult clone() {
+        try {
+            return (UpdateBrokerStorageResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateClusterConfigurationRequest.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateClusterConfigurationRequest.java
new file mode 100644
index 000000000000..4033e037bcf3
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateClusterConfigurationRequest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateClusterConfiguration" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateClusterConfigurationRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     */
+    private String clusterArn;
+    /**
+     * <p>
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
+     * </p>
+     */
+    private ConfigurationInfo configurationInfo;
+    /**
+     * <p>
+     * The version of the cluster that needs to be updated.
+     * </p>
+     */
+    private String currentVersion;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
+     */
+
+    public void setClusterArn(String clusterArn) {
+        this.clusterArn = clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *         </p>
+     */
+
+    public String getClusterArn() {
+        return this.clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) that uniquely identifies the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateClusterConfigurationRequest withClusterArn(String clusterArn) {
+        setClusterArn(clusterArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
+     * </p>
+     * 
+     * @param configurationInfo
+     *        <p>
+     *        Represents the configuration that you want MSK to use for the brokers in a cluster.
+     *        </p>
+     */
+
+    public void setConfigurationInfo(ConfigurationInfo configurationInfo) {
+        this.configurationInfo = configurationInfo;
+    }
+
+    /**
+     * <p>
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         Represents the configuration that you want MSK to use for the brokers in a cluster.
+     *         </p>
+     */
+
+    public ConfigurationInfo getConfigurationInfo() {
+        return this.configurationInfo;
+    }
+
+    /**
+     * <p>
+     * Represents the configuration that you want MSK to use for the brokers in a cluster.
+     * </p>
+     * 
+     * @param configurationInfo
+     *        <p>
+     *        Represents the configuration that you want MSK to use for the brokers in a cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateClusterConfigurationRequest withConfigurationInfo(ConfigurationInfo configurationInfo) {
+        setConfigurationInfo(configurationInfo);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The version of the cluster that needs to be updated.
+     * </p>
+     * 
+     * @param currentVersion
+     *        <p>
+     *        The version of the cluster that needs to be updated.
+     *        </p>
+     */
+
+    public void setCurrentVersion(String currentVersion) {
+        this.currentVersion = currentVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the cluster that needs to be updated.
+     * </p>
+     * 
+     * @return <p>
+     *         The version of the cluster that needs to be updated.
+     *         </p>
+     */
+
+    public String getCurrentVersion() {
+        return this.currentVersion;
+    }
+
+    /**
+     * <p>
+     * The version of the cluster that needs to be updated.
+     * </p>
+     * 
+     * @param currentVersion
+     *        <p>
+     *        The version of the cluster that needs to be updated.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateClusterConfigurationRequest withCurrentVersion(String currentVersion) {
+        setCurrentVersion(currentVersion);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterArn() != null)
+            sb.append("ClusterArn: ").append(getClusterArn()).append(",");
+        if (getConfigurationInfo() != null)
+            sb.append("ConfigurationInfo: ").append(getConfigurationInfo()).append(",");
+        if (getCurrentVersion() != null)
+            sb.append("CurrentVersion: ").append(getCurrentVersion());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateClusterConfigurationRequest == false)
+            return false;
+        UpdateClusterConfigurationRequest other = (UpdateClusterConfigurationRequest) obj;
+        if (other.getClusterArn() == null ^ this.getClusterArn() == null)
+            return false;
+        if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
+            return false;
+        if (other.getConfigurationInfo() == null ^ this.getConfigurationInfo() == null)
+            return false;
+        if (other.getConfigurationInfo() != null && other.getConfigurationInfo().equals(this.getConfigurationInfo()) == false)
+            return false;
+        if (other.getCurrentVersion() == null ^ this.getCurrentVersion() == null)
+            return false;
+        if (other.getCurrentVersion() != null && other.getCurrentVersion().equals(this.getCurrentVersion()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
+        hashCode = prime * hashCode + ((getConfigurationInfo() == null) ? 0 : getConfigurationInfo().hashCode());
+        hashCode = prime * hashCode + ((getCurrentVersion() == null) ? 0 : getCurrentVersion().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateClusterConfigurationRequest clone() {
+        return (UpdateClusterConfigurationRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateClusterConfigurationResult.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateClusterConfigurationResult.java
new file mode 100644
index 000000000000..a6ae7b3340c2
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/UpdateClusterConfigurationResult.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2014-2019 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.kafka.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateClusterConfiguration" target="_top">AWS
+ *      API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateClusterConfigurationResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     */
+    private String clusterArn;
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     */
+    private String clusterOperationArn;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
+     */
+
+    public void setClusterArn(String clusterArn) {
+        this.clusterArn = clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the cluster.
+     *         </p>
+     */
+
+    public String getClusterArn() {
+        return this.clusterArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster.
+     * </p>
+     * 
+     * @param clusterArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateClusterConfigurationResult withClusterArn(String clusterArn) {
+        setClusterArn(clusterArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     * 
+     * @param clusterOperationArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster operation.
+     *        </p>
+     */
+
+    public void setClusterOperationArn(String clusterOperationArn) {
+        this.clusterOperationArn = clusterOperationArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     * 
+     * @return <p>
+     *         The Amazon Resource Name (ARN) of the cluster operation.
+     *         </p>
+     */
+
+    public String getClusterOperationArn() {
+        return this.clusterOperationArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the cluster operation.
+     * </p>
+     * 
+     * @param clusterOperationArn
+     *        <p>
+     *        The Amazon Resource Name (ARN) of the cluster operation.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateClusterConfigurationResult withClusterOperationArn(String clusterOperationArn) {
+        setClusterOperationArn(clusterOperationArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getClusterArn() != null)
+            sb.append("ClusterArn: ").append(getClusterArn()).append(",");
+        if (getClusterOperationArn() != null)
+            sb.append("ClusterOperationArn: ").append(getClusterOperationArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateClusterConfigurationResult == false)
+            return false;
+        UpdateClusterConfigurationResult other = (UpdateClusterConfigurationResult) obj;
+        if (other.getClusterArn() == null ^ this.getClusterArn() == null)
+            return false;
+        if (other.getClusterArn() != null && other.getClusterArn().equals(this.getClusterArn()) == false)
+            return false;
+        if (other.getClusterOperationArn() == null ^ this.getClusterOperationArn() == null)
+            return false;
+        if (other.getClusterOperationArn() != null && other.getClusterOperationArn().equals(this.getClusterOperationArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getClusterArn() == null) ? 0 : getClusterArn().hashCode());
+        hashCode = prime * hashCode + ((getClusterOperationArn() == null) ? 0 : getClusterOperationArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateClusterConfigurationResult clone() {
+        try {
+            return (UpdateClusterConfigurationResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ZookeeperNodeInfo.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ZookeeperNodeInfo.java
index f8d4c8bf9d96..15b31934deb2 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ZookeeperNodeInfo.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/ZookeeperNodeInfo.java
@@ -18,7 +18,8 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * <p>
+ * 
+ <p>
  * Zookeeper node information.
  * </p>
  * 
@@ -40,6 +41,12 @@ public class ZookeeperNodeInfo implements Serializable, Cloneable, StructuredPoj
      * </p>
      */
     private String clientVpcIpAddress;
+    /**
+     * <p>
+     * Endpoints for accessing the ZooKeeper.
+     * </p>
+     */
+    private java.util.List<String> endpoints;
     /**
      * <p>
      * The role-specific ID for Zookeeper.
@@ -59,7 +66,9 @@ public class ZookeeperNodeInfo implements Serializable, Cloneable, StructuredPoj
      * </p>
      * 
      * @param attachedENIId
+     *        <p>
      *        The attached elastic network interface of the broker.
+     *        </p>
      */
 
     public void setAttachedENIId(String attachedENIId) {
@@ -71,7 +80,9 @@ public void setAttachedENIId(String attachedENIId) {
      * The attached elastic network interface of the broker.
      * </p>
      * 
-     * @return The attached elastic network interface of the broker.
+     * @return <p>
+     *         The attached elastic network interface of the broker.
+     *         </p>
      */
 
     public String getAttachedENIId() {
@@ -84,7 +95,9 @@ public String getAttachedENIId() {
      * </p>
      * 
      * @param attachedENIId
+     *        <p>
      *        The attached elastic network interface of the broker.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -99,7 +112,9 @@ public ZookeeperNodeInfo withAttachedENIId(String attachedENIId) {
      * </p>
      * 
      * @param clientVpcIpAddress
+     *        <p>
      *        The virtual private cloud (VPC) IP address of the client.
+     *        </p>
      */
 
     public void setClientVpcIpAddress(String clientVpcIpAddress) {
@@ -111,7 +126,9 @@ public void setClientVpcIpAddress(String clientVpcIpAddress) {
      * The virtual private cloud (VPC) IP address of the client.
      * </p>
      * 
-     * @return The virtual private cloud (VPC) IP address of the client.
+     * @return <p>
+     *         The virtual private cloud (VPC) IP address of the client.
+     *         </p>
      */
 
     public String getClientVpcIpAddress() {
@@ -124,7 +141,9 @@ public String getClientVpcIpAddress() {
      * </p>
      * 
      * @param clientVpcIpAddress
+     *        <p>
      *        The virtual private cloud (VPC) IP address of the client.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -133,13 +152,94 @@ public ZookeeperNodeInfo withClientVpcIpAddress(String clientVpcIpAddress) {
         return this;
     }
 
+    /**
+     * <p>
+     * Endpoints for accessing the ZooKeeper.
+     * </p>
+     * 
+     * @return <p>
+     *         Endpoints for accessing the ZooKeeper.
+     *         </p>
+     */
+
+    public java.util.List<String> getEndpoints() {
+        return endpoints;
+    }
+
+    /**
+     * <p>
+     * Endpoints for accessing the ZooKeeper.
+     * </p>
+     * 
+     * @param endpoints
+     *        <p>
+     *        Endpoints for accessing the ZooKeeper.
+     *        </p>
+     */
+
+    public void setEndpoints(java.util.Collection<String> endpoints) {
+        if (endpoints == null) {
+            this.endpoints = null;
+            return;
+        }
+
+        this.endpoints = new java.util.ArrayList<String>(endpoints);
+    }
+
+    /**
+     * <p>
+     * Endpoints for accessing the ZooKeeper.
+     * </p>
+     * 
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setEndpoints(java.util.Collection)} or {@link #withEndpoints(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param endpoints
+     *        <p>
+     *        Endpoints for accessing the ZooKeeper.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ZookeeperNodeInfo withEndpoints(String... endpoints) {
+        if (this.endpoints == null) {
+            setEndpoints(new java.util.ArrayList<String>(endpoints.length));
+        }
+        for (String ele : endpoints) {
+            this.endpoints.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Endpoints for accessing the ZooKeeper.
+     * </p>
+     * 
+     * @param endpoints
+     *        <p>
+     *        Endpoints for accessing the ZooKeeper.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ZookeeperNodeInfo withEndpoints(java.util.Collection<String> endpoints) {
+        setEndpoints(endpoints);
+        return this;
+    }
+
     /**
      * <p>
      * The role-specific ID for Zookeeper.
      * </p>
      * 
      * @param zookeeperId
+     *        <p>
      *        The role-specific ID for Zookeeper.
+     *        </p>
      */
 
     public void setZookeeperId(Double zookeeperId) {
@@ -151,7 +251,9 @@ public void setZookeeperId(Double zookeeperId) {
      * The role-specific ID for Zookeeper.
      * </p>
      * 
-     * @return The role-specific ID for Zookeeper.
+     * @return <p>
+     *         The role-specific ID for Zookeeper.
+     *         </p>
      */
 
     public Double getZookeeperId() {
@@ -164,7 +266,9 @@ public Double getZookeeperId() {
      * </p>
      * 
      * @param zookeeperId
+     *        <p>
      *        The role-specific ID for Zookeeper.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -179,7 +283,9 @@ public ZookeeperNodeInfo withZookeeperId(Double zookeeperId) {
      * </p>
      * 
      * @param zookeeperVersion
+     *        <p>
      *        The version of Zookeeper.
+     *        </p>
      */
 
     public void setZookeeperVersion(String zookeeperVersion) {
@@ -191,7 +297,9 @@ public void setZookeeperVersion(String zookeeperVersion) {
      * The version of Zookeeper.
      * </p>
      * 
-     * @return The version of Zookeeper.
+     * @return <p>
+     *         The version of Zookeeper.
+     *         </p>
      */
 
     public String getZookeeperVersion() {
@@ -204,7 +312,9 @@ public String getZookeeperVersion() {
      * </p>
      * 
      * @param zookeeperVersion
+     *        <p>
      *        The version of Zookeeper.
+     *        </p>
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -229,6 +339,8 @@ public String toString() {
             sb.append("AttachedENIId: ").append(getAttachedENIId()).append(",");
         if (getClientVpcIpAddress() != null)
             sb.append("ClientVpcIpAddress: ").append(getClientVpcIpAddress()).append(",");
+        if (getEndpoints() != null)
+            sb.append("Endpoints: ").append(getEndpoints()).append(",");
         if (getZookeeperId() != null)
             sb.append("ZookeeperId: ").append(getZookeeperId()).append(",");
         if (getZookeeperVersion() != null)
@@ -255,6 +367,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getClientVpcIpAddress() != null && other.getClientVpcIpAddress().equals(this.getClientVpcIpAddress()) == false)
             return false;
+        if (other.getEndpoints() == null ^ this.getEndpoints() == null)
+            return false;
+        if (other.getEndpoints() != null && other.getEndpoints().equals(this.getEndpoints()) == false)
+            return false;
         if (other.getZookeeperId() == null ^ this.getZookeeperId() == null)
             return false;
         if (other.getZookeeperId() != null && other.getZookeeperId().equals(this.getZookeeperId()) == false)
@@ -273,6 +389,7 @@ public int hashCode() {
 
         hashCode = prime * hashCode + ((getAttachedENIId() == null) ? 0 : getAttachedENIId().hashCode());
         hashCode = prime * hashCode + ((getClientVpcIpAddress() == null) ? 0 : getClientVpcIpAddress().hashCode());
+        hashCode = prime * hashCode + ((getEndpoints() == null) ? 0 : getEndpoints().hashCode());
         hashCode = prime * hashCode + ((getZookeeperId() == null) ? 0 : getZookeeperId().hashCode());
         hashCode = prime * hashCode + ((getZookeeperVersion() == null) ? 0 : getZookeeperVersion().hashCode());
         return hashCode;
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerEBSVolumeInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerEBSVolumeInfoJsonUnmarshaller.java
new file mode 100644
index 000000000000..6387de62cd5e
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerEBSVolumeInfoJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BrokerEBSVolumeInfo JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BrokerEBSVolumeInfoJsonUnmarshaller implements Unmarshaller<BrokerEBSVolumeInfo, JsonUnmarshallerContext> {
+
+    public BrokerEBSVolumeInfo unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BrokerEBSVolumeInfo brokerEBSVolumeInfo = new BrokerEBSVolumeInfo();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("kafkaBrokerNodeId", targetDepth)) {
+                    context.nextToken();
+                    brokerEBSVolumeInfo.setKafkaBrokerNodeId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("volumeSizeGB", targetDepth)) {
+                    context.nextToken();
+                    brokerEBSVolumeInfo.setVolumeSizeGB(context.getUnmarshaller(Integer.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return brokerEBSVolumeInfo;
+    }
+
+    private static BrokerEBSVolumeInfoJsonUnmarshaller instance;
+
+    public static BrokerEBSVolumeInfoJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BrokerEBSVolumeInfoJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerEBSVolumeInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerEBSVolumeInfoMarshaller.java
new file mode 100644
index 000000000000..578ad36829bd
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerEBSVolumeInfoMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BrokerEBSVolumeInfoMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BrokerEBSVolumeInfoMarshaller {
+
+    private static final MarshallingInfo<String> KAFKABROKERNODEID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("kafkaBrokerNodeId").build();
+    private static final MarshallingInfo<Integer> VOLUMESIZEGB_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("volumeSizeGB").build();
+
+    private static final BrokerEBSVolumeInfoMarshaller instance = new BrokerEBSVolumeInfoMarshaller();
+
+    public static BrokerEBSVolumeInfoMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BrokerEBSVolumeInfo brokerEBSVolumeInfo, ProtocolMarshaller protocolMarshaller) {
+
+        if (brokerEBSVolumeInfo == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(brokerEBSVolumeInfo.getKafkaBrokerNodeId(), KAFKABROKERNODEID_BINDING);
+            protocolMarshaller.marshall(brokerEBSVolumeInfo.getVolumeSizeGB(), VOLUMESIZEGB_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoJsonUnmarshaller.java
index 782168b56960..cb295d790c8b 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoJsonUnmarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoJsonUnmarshaller.java
@@ -68,6 +68,10 @@ public BrokerNodeInfo unmarshall(JsonUnmarshallerContext context) throws Excepti
                     context.nextToken();
                     brokerNodeInfo.setCurrentBrokerSoftwareInfo(BrokerSoftwareInfoJsonUnmarshaller.getInstance().unmarshall(context));
                 }
+                if (context.testExpression("endpoints", targetDepth)) {
+                    context.nextToken();
+                    brokerNodeInfo.setEndpoints(new ListUnmarshaller<String>(context.getUnmarshaller(String.class)).unmarshall(context));
+                }
             } else if (token == END_ARRAY || token == END_OBJECT) {
                 if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
                     if (context.getCurrentDepth() <= originalDepth)
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoMarshaller.java
index a7865eb50318..5712087a5d97 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoMarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/BrokerNodeInfoMarshaller.java
@@ -12,6 +12,7 @@
  */
 package com.amazonaws.services.kafka.model.transform;
 
+import java.util.List;
 import javax.annotation.Generated;
 
 import com.amazonaws.SdkClientException;
@@ -37,6 +38,8 @@ public class BrokerNodeInfoMarshaller {
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clientVpcIpAddress").build();
     private static final MarshallingInfo<StructuredPojo> CURRENTBROKERSOFTWAREINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("currentBrokerSoftwareInfo").build();
+    private static final MarshallingInfo<List> ENDPOINTS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("endpoints").build();
 
     private static final BrokerNodeInfoMarshaller instance = new BrokerNodeInfoMarshaller();
 
@@ -59,6 +62,7 @@ public void marshall(BrokerNodeInfo brokerNodeInfo, ProtocolMarshaller protocolM
             protocolMarshaller.marshall(brokerNodeInfo.getClientSubnet(), CLIENTSUBNET_BINDING);
             protocolMarshaller.marshall(brokerNodeInfo.getClientVpcIpAddress(), CLIENTVPCIPADDRESS_BINDING);
             protocolMarshaller.marshall(brokerNodeInfo.getCurrentBrokerSoftwareInfo(), CURRENTBROKERSOFTWAREINFO_BINDING);
+            protocolMarshaller.marshall(brokerNodeInfo.getEndpoints(), ENDPOINTS_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
         }
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClientAuthenticationJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClientAuthenticationJsonUnmarshaller.java
new file mode 100644
index 000000000000..80a3e6443497
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClientAuthenticationJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ClientAuthentication JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ClientAuthenticationJsonUnmarshaller implements Unmarshaller<ClientAuthentication, JsonUnmarshallerContext> {
+
+    public ClientAuthentication unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ClientAuthentication clientAuthentication = new ClientAuthentication();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("tls", targetDepth)) {
+                    context.nextToken();
+                    clientAuthentication.setTls(TlsJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return clientAuthentication;
+    }
+
+    private static ClientAuthenticationJsonUnmarshaller instance;
+
+    public static ClientAuthenticationJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ClientAuthenticationJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClientAuthenticationMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClientAuthenticationMarshaller.java
new file mode 100644
index 000000000000..b0f67425fe82
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClientAuthenticationMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ClientAuthenticationMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ClientAuthenticationMarshaller {
+
+    private static final MarshallingInfo<StructuredPojo> TLS_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("tls").build();
+
+    private static final ClientAuthenticationMarshaller instance = new ClientAuthenticationMarshaller();
+
+    public static ClientAuthenticationMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ClientAuthentication clientAuthentication, ProtocolMarshaller protocolMarshaller) {
+
+        if (clientAuthentication == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(clientAuthentication.getTls(), TLS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoJsonUnmarshaller.java
index b4541d266de7..02dbf06f8bed 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoJsonUnmarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoJsonUnmarshaller.java
@@ -48,10 +48,18 @@ public ClusterInfo unmarshall(JsonUnmarshallerContext context) throws Exception
                 break;
 
             if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("activeOperationArn", targetDepth)) {
+                    context.nextToken();
+                    clusterInfo.setActiveOperationArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
                 if (context.testExpression("brokerNodeGroupInfo", targetDepth)) {
                     context.nextToken();
                     clusterInfo.setBrokerNodeGroupInfo(BrokerNodeGroupInfoJsonUnmarshaller.getInstance().unmarshall(context));
                 }
+                if (context.testExpression("clientAuthentication", targetDepth)) {
+                    context.nextToken();
+                    clusterInfo.setClientAuthentication(ClientAuthenticationJsonUnmarshaller.getInstance().unmarshall(context));
+                }
                 if (context.testExpression("clusterArn", targetDepth)) {
                     context.nextToken();
                     clusterInfo.setClusterArn(context.getUnmarshaller(String.class).unmarshall(context));
@@ -88,6 +96,11 @@ public ClusterInfo unmarshall(JsonUnmarshallerContext context) throws Exception
                     context.nextToken();
                     clusterInfo.setState(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("tags", targetDepth)) {
+                    context.nextToken();
+                    clusterInfo.setTags(new MapUnmarshaller<String, String>(context.getUnmarshaller(String.class), context.getUnmarshaller(String.class))
+                            .unmarshall(context));
+                }
                 if (context.testExpression("zookeeperConnectString", targetDepth)) {
                     context.nextToken();
                     clusterInfo.setZookeeperConnectString(context.getUnmarshaller(String.class).unmarshall(context));
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoMarshaller.java
index 9c8377f17578..ca5481227471 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoMarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterInfoMarshaller.java
@@ -12,6 +12,8 @@
  */
 package com.amazonaws.services.kafka.model.transform;
 
+import java.util.Map;
+
 import javax.annotation.Generated;
 
 import com.amazonaws.SdkClientException;
@@ -27,8 +29,12 @@
 @SdkInternalApi
 public class ClusterInfoMarshaller {
 
+    private static final MarshallingInfo<String> ACTIVEOPERATIONARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("activeOperationArn").build();
     private static final MarshallingInfo<StructuredPojo> BROKERNODEGROUPINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("brokerNodeGroupInfo").build();
+    private static final MarshallingInfo<StructuredPojo> CLIENTAUTHENTICATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clientAuthentication").build();
     private static final MarshallingInfo<String> CLUSTERARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clusterArn").build();
     private static final MarshallingInfo<String> CLUSTERNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
@@ -47,6 +53,8 @@ public class ClusterInfoMarshaller {
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("numberOfBrokerNodes").build();
     private static final MarshallingInfo<String> STATE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
             .marshallLocationName("state").build();
+    private static final MarshallingInfo<Map> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.MAP).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
     private static final MarshallingInfo<String> ZOOKEEPERCONNECTSTRING_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("zookeeperConnectString").build();
 
@@ -66,7 +74,9 @@ public void marshall(ClusterInfo clusterInfo, ProtocolMarshaller protocolMarshal
         }
 
         try {
+            protocolMarshaller.marshall(clusterInfo.getActiveOperationArn(), ACTIVEOPERATIONARN_BINDING);
             protocolMarshaller.marshall(clusterInfo.getBrokerNodeGroupInfo(), BROKERNODEGROUPINFO_BINDING);
+            protocolMarshaller.marshall(clusterInfo.getClientAuthentication(), CLIENTAUTHENTICATION_BINDING);
             protocolMarshaller.marshall(clusterInfo.getClusterArn(), CLUSTERARN_BINDING);
             protocolMarshaller.marshall(clusterInfo.getClusterName(), CLUSTERNAME_BINDING);
             protocolMarshaller.marshall(clusterInfo.getCreationTime(), CREATIONTIME_BINDING);
@@ -76,6 +86,7 @@ public void marshall(ClusterInfo clusterInfo, ProtocolMarshaller protocolMarshal
             protocolMarshaller.marshall(clusterInfo.getEnhancedMonitoring(), ENHANCEDMONITORING_BINDING);
             protocolMarshaller.marshall(clusterInfo.getNumberOfBrokerNodes(), NUMBEROFBROKERNODES_BINDING);
             protocolMarshaller.marshall(clusterInfo.getState(), STATE_BINDING);
+            protocolMarshaller.marshall(clusterInfo.getTags(), TAGS_BINDING);
             protocolMarshaller.marshall(clusterInfo.getZookeeperConnectString(), ZOOKEEPERCONNECTSTRING_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterOperationInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterOperationInfoJsonUnmarshaller.java
new file mode 100644
index 000000000000..742695d74522
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterOperationInfoJsonUnmarshaller.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ClusterOperationInfo JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ClusterOperationInfoJsonUnmarshaller implements Unmarshaller<ClusterOperationInfo, JsonUnmarshallerContext> {
+
+    public ClusterOperationInfo unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ClusterOperationInfo clusterOperationInfo = new ClusterOperationInfo();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("clientRequestId", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setClientRequestId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("clusterArn", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setClusterArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("creationTime", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setCreationTime(DateJsonUnmarshallerFactory.getInstance("iso8601").unmarshall(context));
+                }
+                if (context.testExpression("endTime", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setEndTime(DateJsonUnmarshallerFactory.getInstance("iso8601").unmarshall(context));
+                }
+                if (context.testExpression("errorInfo", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setErrorInfo(ErrorInfoJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("operationArn", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setOperationArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("operationState", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setOperationState(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("operationType", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setOperationType(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("sourceClusterInfo", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setSourceClusterInfo(MutableClusterInfoJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("targetClusterInfo", targetDepth)) {
+                    context.nextToken();
+                    clusterOperationInfo.setTargetClusterInfo(MutableClusterInfoJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return clusterOperationInfo;
+    }
+
+    private static ClusterOperationInfoJsonUnmarshaller instance;
+
+    public static ClusterOperationInfoJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ClusterOperationInfoJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterOperationInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterOperationInfoMarshaller.java
new file mode 100644
index 000000000000..5c71090455ca
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ClusterOperationInfoMarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ClusterOperationInfoMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ClusterOperationInfoMarshaller {
+
+    private static final MarshallingInfo<String> CLIENTREQUESTID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clientRequestId").build();
+    private static final MarshallingInfo<String> CLUSTERARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clusterArn").build();
+    private static final MarshallingInfo<java.util.Date> CREATIONTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("creationTime").timestampFormat("iso8601").build();
+    private static final MarshallingInfo<java.util.Date> ENDTIME_BINDING = MarshallingInfo.builder(MarshallingType.DATE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("endTime").timestampFormat("iso8601").build();
+    private static final MarshallingInfo<StructuredPojo> ERRORINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("errorInfo").build();
+    private static final MarshallingInfo<String> OPERATIONARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("operationArn").build();
+    private static final MarshallingInfo<String> OPERATIONSTATE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("operationState").build();
+    private static final MarshallingInfo<String> OPERATIONTYPE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("operationType").build();
+    private static final MarshallingInfo<StructuredPojo> SOURCECLUSTERINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("sourceClusterInfo").build();
+    private static final MarshallingInfo<StructuredPojo> TARGETCLUSTERINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("targetClusterInfo").build();
+
+    private static final ClusterOperationInfoMarshaller instance = new ClusterOperationInfoMarshaller();
+
+    public static ClusterOperationInfoMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ClusterOperationInfo clusterOperationInfo, ProtocolMarshaller protocolMarshaller) {
+
+        if (clusterOperationInfo == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(clusterOperationInfo.getClientRequestId(), CLIENTREQUESTID_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getClusterArn(), CLUSTERARN_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getCreationTime(), CREATIONTIME_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getEndTime(), ENDTIME_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getErrorInfo(), ERRORINFO_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getOperationArn(), OPERATIONARN_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getOperationState(), OPERATIONSTATE_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getOperationType(), OPERATIONTYPE_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getSourceClusterInfo(), SOURCECLUSTERINFO_BINDING);
+            protocolMarshaller.marshall(clusterOperationInfo.getTargetClusterInfo(), TARGETCLUSTERINFO_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/CreateClusterRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/CreateClusterRequestMarshaller.java
index 8570f3780b98..7682ba8fb4a4 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/CreateClusterRequestMarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/CreateClusterRequestMarshaller.java
@@ -12,6 +12,8 @@
  */
 package com.amazonaws.services.kafka.model.transform;
 
+import java.util.Map;
+
 import javax.annotation.Generated;
 
 import com.amazonaws.SdkClientException;
@@ -29,6 +31,8 @@ public class CreateClusterRequestMarshaller {
 
     private static final MarshallingInfo<StructuredPojo> BROKERNODEGROUPINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("brokerNodeGroupInfo").build();
+    private static final MarshallingInfo<StructuredPojo> CLIENTAUTHENTICATION_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clientAuthentication").build();
     private static final MarshallingInfo<String> CLUSTERNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clusterName").build();
     private static final MarshallingInfo<StructuredPojo> CONFIGURATIONINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
@@ -41,6 +45,8 @@ public class CreateClusterRequestMarshaller {
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("kafkaVersion").build();
     private static final MarshallingInfo<Integer> NUMBEROFBROKERNODES_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("numberOfBrokerNodes").build();
+    private static final MarshallingInfo<Map> TAGS_BINDING = MarshallingInfo.builder(MarshallingType.MAP).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("tags").build();
 
     private static final CreateClusterRequestMarshaller instance = new CreateClusterRequestMarshaller();
 
@@ -59,12 +65,14 @@ public void marshall(CreateClusterRequest createClusterRequest, ProtocolMarshall
 
         try {
             protocolMarshaller.marshall(createClusterRequest.getBrokerNodeGroupInfo(), BROKERNODEGROUPINFO_BINDING);
+            protocolMarshaller.marshall(createClusterRequest.getClientAuthentication(), CLIENTAUTHENTICATION_BINDING);
             protocolMarshaller.marshall(createClusterRequest.getClusterName(), CLUSTERNAME_BINDING);
             protocolMarshaller.marshall(createClusterRequest.getConfigurationInfo(), CONFIGURATIONINFO_BINDING);
             protocolMarshaller.marshall(createClusterRequest.getEncryptionInfo(), ENCRYPTIONINFO_BINDING);
             protocolMarshaller.marshall(createClusterRequest.getEnhancedMonitoring(), ENHANCEDMONITORING_BINDING);
             protocolMarshaller.marshall(createClusterRequest.getKafkaVersion(), KAFKAVERSION_BINDING);
             protocolMarshaller.marshall(createClusterRequest.getNumberOfBrokerNodes(), NUMBEROFBROKERNODES_BINDING);
+            protocolMarshaller.marshall(createClusterRequest.getTags(), TAGS_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
         }
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationRequestMarshaller.java
new file mode 100644
index 000000000000..259930438a98
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationRequestMarshaller.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeClusterOperationRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeClusterOperationRequestMarshaller {
+
+    private static final MarshallingInfo<String> CLUSTEROPERATIONARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PATH).marshallLocationName("clusterOperationArn").build();
+
+    private static final DescribeClusterOperationRequestMarshaller instance = new DescribeClusterOperationRequestMarshaller();
+
+    public static DescribeClusterOperationRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(DescribeClusterOperationRequest describeClusterOperationRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (describeClusterOperationRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(describeClusterOperationRequest.getClusterOperationArn(), CLUSTEROPERATIONARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationRequestProtocolMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..debde396d72c
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * DescribeClusterOperationRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class DescribeClusterOperationRequestProtocolMarshaller implements Marshaller<Request<DescribeClusterOperationRequest>, DescribeClusterOperationRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/v1/operations/{clusterOperationArn}").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false)
+            .serviceName("AWSKafka").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public DescribeClusterOperationRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<DescribeClusterOperationRequest> marshall(DescribeClusterOperationRequest describeClusterOperationRequest) {
+
+        if (describeClusterOperationRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<DescribeClusterOperationRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(
+                    SDK_OPERATION_BINDING, describeClusterOperationRequest);
+
+            protocolMarshaller.startMarshalling();
+            DescribeClusterOperationRequestMarshaller.getInstance().marshall(describeClusterOperationRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationResultJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..2ec66b31514b
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/DescribeClusterOperationResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * DescribeClusterOperationResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class DescribeClusterOperationResultJsonUnmarshaller implements Unmarshaller<DescribeClusterOperationResult, JsonUnmarshallerContext> {
+
+    public DescribeClusterOperationResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        DescribeClusterOperationResult describeClusterOperationResult = new DescribeClusterOperationResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return describeClusterOperationResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("clusterOperationInfo", targetDepth)) {
+                    context.nextToken();
+                    describeClusterOperationResult.setClusterOperationInfo(ClusterOperationInfoJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return describeClusterOperationResult;
+    }
+
+    private static DescribeClusterOperationResultJsonUnmarshaller instance;
+
+    public static DescribeClusterOperationResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new DescribeClusterOperationResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInTransitJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInTransitJsonUnmarshaller.java
new file mode 100644
index 000000000000..5e17b7a5be12
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInTransitJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * EncryptionInTransit JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class EncryptionInTransitJsonUnmarshaller implements Unmarshaller<EncryptionInTransit, JsonUnmarshallerContext> {
+
+    public EncryptionInTransit unmarshall(JsonUnmarshallerContext context) throws Exception {
+        EncryptionInTransit encryptionInTransit = new EncryptionInTransit();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("clientBroker", targetDepth)) {
+                    context.nextToken();
+                    encryptionInTransit.setClientBroker(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("inCluster", targetDepth)) {
+                    context.nextToken();
+                    encryptionInTransit.setInCluster(context.getUnmarshaller(Boolean.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return encryptionInTransit;
+    }
+
+    private static EncryptionInTransitJsonUnmarshaller instance;
+
+    public static EncryptionInTransitJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new EncryptionInTransitJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInTransitMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInTransitMarshaller.java
new file mode 100644
index 000000000000..167a5ecbae45
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInTransitMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * EncryptionInTransitMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class EncryptionInTransitMarshaller {
+
+    private static final MarshallingInfo<String> CLIENTBROKER_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clientBroker").build();
+    private static final MarshallingInfo<Boolean> INCLUSTER_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("inCluster").build();
+
+    private static final EncryptionInTransitMarshaller instance = new EncryptionInTransitMarshaller();
+
+    public static EncryptionInTransitMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(EncryptionInTransit encryptionInTransit, ProtocolMarshaller protocolMarshaller) {
+
+        if (encryptionInTransit == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(encryptionInTransit.getClientBroker(), CLIENTBROKER_BINDING);
+            protocolMarshaller.marshall(encryptionInTransit.getInCluster(), INCLUSTER_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoJsonUnmarshaller.java
index cd305a477fdc..9a8f53656d38 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoJsonUnmarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoJsonUnmarshaller.java
@@ -52,6 +52,10 @@ public EncryptionInfo unmarshall(JsonUnmarshallerContext context) throws Excepti
                     context.nextToken();
                     encryptionInfo.setEncryptionAtRest(EncryptionAtRestJsonUnmarshaller.getInstance().unmarshall(context));
                 }
+                if (context.testExpression("encryptionInTransit", targetDepth)) {
+                    context.nextToken();
+                    encryptionInfo.setEncryptionInTransit(EncryptionInTransitJsonUnmarshaller.getInstance().unmarshall(context));
+                }
             } else if (token == END_ARRAY || token == END_OBJECT) {
                 if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
                     if (context.getCurrentDepth() <= originalDepth)
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoMarshaller.java
index a4a546a8fc92..1b7383d79e23 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoMarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/EncryptionInfoMarshaller.java
@@ -29,6 +29,8 @@ public class EncryptionInfoMarshaller {
 
     private static final MarshallingInfo<StructuredPojo> ENCRYPTIONATREST_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("encryptionAtRest").build();
+    private static final MarshallingInfo<StructuredPojo> ENCRYPTIONINTRANSIT_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("encryptionInTransit").build();
 
     private static final EncryptionInfoMarshaller instance = new EncryptionInfoMarshaller();
 
@@ -47,6 +49,7 @@ public void marshall(EncryptionInfo encryptionInfo, ProtocolMarshaller protocolM
 
         try {
             protocolMarshaller.marshall(encryptionInfo.getEncryptionAtRest(), ENCRYPTIONATREST_BINDING);
+            protocolMarshaller.marshall(encryptionInfo.getEncryptionInTransit(), ENCRYPTIONINTRANSIT_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
         }
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ErrorInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ErrorInfoJsonUnmarshaller.java
new file mode 100644
index 000000000000..6224c7c0ed9b
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ErrorInfoJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ErrorInfo JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ErrorInfoJsonUnmarshaller implements Unmarshaller<ErrorInfo, JsonUnmarshallerContext> {
+
+    public ErrorInfo unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ErrorInfo errorInfo = new ErrorInfo();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("errorCode", targetDepth)) {
+                    context.nextToken();
+                    errorInfo.setErrorCode(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("errorString", targetDepth)) {
+                    context.nextToken();
+                    errorInfo.setErrorString(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return errorInfo;
+    }
+
+    private static ErrorInfoJsonUnmarshaller instance;
+
+    public static ErrorInfoJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ErrorInfoJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ErrorInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ErrorInfoMarshaller.java
new file mode 100644
index 000000000000..3f6ab491daf4
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ErrorInfoMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ErrorInfoMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ErrorInfoMarshaller {
+
+    private static final MarshallingInfo<String> ERRORCODE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("errorCode").build();
+    private static final MarshallingInfo<String> ERRORSTRING_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("errorString").build();
+
+    private static final ErrorInfoMarshaller instance = new ErrorInfoMarshaller();
+
+    public static ErrorInfoMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ErrorInfo errorInfo, ProtocolMarshaller protocolMarshaller) {
+
+        if (errorInfo == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(errorInfo.getErrorCode(), ERRORCODE_BINDING);
+            protocolMarshaller.marshall(errorInfo.getErrorString(), ERRORSTRING_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/GetBootstrapBrokersResultJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/GetBootstrapBrokersResultJsonUnmarshaller.java
index fcc747198abf..4b69e58f3f4b 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/GetBootstrapBrokersResultJsonUnmarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/GetBootstrapBrokersResultJsonUnmarshaller.java
@@ -52,6 +52,10 @@ public GetBootstrapBrokersResult unmarshall(JsonUnmarshallerContext context) thr
                     context.nextToken();
                     getBootstrapBrokersResult.setBootstrapBrokerString(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("bootstrapBrokerStringTls", targetDepth)) {
+                    context.nextToken();
+                    getBootstrapBrokersResult.setBootstrapBrokerStringTls(context.getUnmarshaller(String.class).unmarshall(context));
+                }
             } else if (token == END_ARRAY || token == END_OBJECT) {
                 if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
                     if (context.getCurrentDepth() <= originalDepth)
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsRequestMarshaller.java
new file mode 100644
index 000000000000..a1483517f6e9
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListClusterOperationsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListClusterOperationsRequestMarshaller {
+
+    private static final MarshallingInfo<String> CLUSTERARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("clusterArn").build();
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
+
+    private static final ListClusterOperationsRequestMarshaller instance = new ListClusterOperationsRequestMarshaller();
+
+    public static ListClusterOperationsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListClusterOperationsRequest listClusterOperationsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listClusterOperationsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listClusterOperationsRequest.getClusterArn(), CLUSTERARN_BINDING);
+            protocolMarshaller.marshall(listClusterOperationsRequest.getMaxResults(), MAXRESULTS_BINDING);
+            protocolMarshaller.marshall(listClusterOperationsRequest.getNextToken(), NEXTTOKEN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsRequestProtocolMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..d29c1645ed49
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListClusterOperationsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListClusterOperationsRequestProtocolMarshaller implements Marshaller<Request<ListClusterOperationsRequest>, ListClusterOperationsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/v1/clusters/{clusterArn}/operations").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false)
+            .serviceName("AWSKafka").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListClusterOperationsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListClusterOperationsRequest> marshall(ListClusterOperationsRequest listClusterOperationsRequest) {
+
+        if (listClusterOperationsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListClusterOperationsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    listClusterOperationsRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListClusterOperationsRequestMarshaller.getInstance().marshall(listClusterOperationsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsResultJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..2e6379b287d0
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListClusterOperationsResultJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListClusterOperationsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListClusterOperationsResultJsonUnmarshaller implements Unmarshaller<ListClusterOperationsResult, JsonUnmarshallerContext> {
+
+    public ListClusterOperationsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListClusterOperationsResult listClusterOperationsResult = new ListClusterOperationsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listClusterOperationsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("clusterOperationInfoList", targetDepth)) {
+                    context.nextToken();
+                    listClusterOperationsResult.setClusterOperationInfoList(new ListUnmarshaller<ClusterOperationInfo>(ClusterOperationInfoJsonUnmarshaller
+                            .getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listClusterOperationsResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listClusterOperationsResult;
+    }
+
+    private static ListClusterOperationsResultJsonUnmarshaller instance;
+
+    public static ListClusterOperationsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListClusterOperationsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsRequestMarshaller.java
new file mode 100644
index 000000000000..0be5edc3ca45
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListConfigurationRevisionsRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListConfigurationRevisionsRequestMarshaller {
+
+    private static final MarshallingInfo<String> ARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("arn").build();
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
+    private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
+
+    private static final ListConfigurationRevisionsRequestMarshaller instance = new ListConfigurationRevisionsRequestMarshaller();
+
+    public static ListConfigurationRevisionsRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListConfigurationRevisionsRequest listConfigurationRevisionsRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listConfigurationRevisionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listConfigurationRevisionsRequest.getArn(), ARN_BINDING);
+            protocolMarshaller.marshall(listConfigurationRevisionsRequest.getMaxResults(), MAXRESULTS_BINDING);
+            protocolMarshaller.marshall(listConfigurationRevisionsRequest.getNextToken(), NEXTTOKEN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsRequestProtocolMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..6b6819e3ac3e
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsRequestProtocolMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListConfigurationRevisionsRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListConfigurationRevisionsRequestProtocolMarshaller implements
+        Marshaller<Request<ListConfigurationRevisionsRequest>, ListConfigurationRevisionsRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/v1/configurations/{arn}/revisions").httpMethodName(HttpMethodName.GET).hasExplicitPayloadMember(false).hasPayloadMembers(false)
+            .serviceName("AWSKafka").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListConfigurationRevisionsRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListConfigurationRevisionsRequest> marshall(ListConfigurationRevisionsRequest listConfigurationRevisionsRequest) {
+
+        if (listConfigurationRevisionsRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListConfigurationRevisionsRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(
+                    SDK_OPERATION_BINDING, listConfigurationRevisionsRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListConfigurationRevisionsRequestMarshaller.getInstance().marshall(listConfigurationRevisionsRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsResultJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..2a2295b7135d
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationRevisionsResultJsonUnmarshaller.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListConfigurationRevisionsResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListConfigurationRevisionsResultJsonUnmarshaller implements Unmarshaller<ListConfigurationRevisionsResult, JsonUnmarshallerContext> {
+
+    public ListConfigurationRevisionsResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListConfigurationRevisionsResult listConfigurationRevisionsResult = new ListConfigurationRevisionsResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listConfigurationRevisionsResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("nextToken", targetDepth)) {
+                    context.nextToken();
+                    listConfigurationRevisionsResult.setNextToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("revisions", targetDepth)) {
+                    context.nextToken();
+                    listConfigurationRevisionsResult.setRevisions(new ListUnmarshaller<ConfigurationRevision>(ConfigurationRevisionJsonUnmarshaller
+                            .getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listConfigurationRevisionsResult;
+    }
+
+    private static ListConfigurationRevisionsResultJsonUnmarshaller instance;
+
+    public static ListConfigurationRevisionsResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListConfigurationRevisionsResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationsRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationsRequestMarshaller.java
index 987de17c3d96..6c019a776882 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationsRequestMarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ListConfigurationsRequestMarshaller.java
@@ -27,7 +27,7 @@
 @SdkInternalApi
 public class ListConfigurationsRequestMarshaller {
 
-    private static final MarshallingInfo<String> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+    private static final MarshallingInfo<Integer> MAXRESULTS_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
             .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("maxResults").build();
     private static final MarshallingInfo<String> NEXTTOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.QUERY_PARAM).marshallLocationName("nextToken").build();
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/MutableClusterInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/MutableClusterInfoJsonUnmarshaller.java
new file mode 100644
index 000000000000..58900bca911a
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/MutableClusterInfoJsonUnmarshaller.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * MutableClusterInfo JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class MutableClusterInfoJsonUnmarshaller implements Unmarshaller<MutableClusterInfo, JsonUnmarshallerContext> {
+
+    public MutableClusterInfo unmarshall(JsonUnmarshallerContext context) throws Exception {
+        MutableClusterInfo mutableClusterInfo = new MutableClusterInfo();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("brokerEBSVolumeInfo", targetDepth)) {
+                    context.nextToken();
+                    mutableClusterInfo.setBrokerEBSVolumeInfo(new ListUnmarshaller<BrokerEBSVolumeInfo>(BrokerEBSVolumeInfoJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+                if (context.testExpression("configurationInfo", targetDepth)) {
+                    context.nextToken();
+                    mutableClusterInfo.setConfigurationInfo(ConfigurationInfoJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+                if (context.testExpression("numberOfBrokerNodes", targetDepth)) {
+                    context.nextToken();
+                    mutableClusterInfo.setNumberOfBrokerNodes(context.getUnmarshaller(Integer.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return mutableClusterInfo;
+    }
+
+    private static MutableClusterInfoJsonUnmarshaller instance;
+
+    public static MutableClusterInfoJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new MutableClusterInfoJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/MutableClusterInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/MutableClusterInfoMarshaller.java
new file mode 100644
index 000000000000..f23987e570d3
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/MutableClusterInfoMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * MutableClusterInfoMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class MutableClusterInfoMarshaller {
+
+    private static final MarshallingInfo<List> BROKEREBSVOLUMEINFO_BINDING = MarshallingInfo.builder(MarshallingType.LIST)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("brokerEBSVolumeInfo").build();
+    private static final MarshallingInfo<StructuredPojo> CONFIGURATIONINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("configurationInfo").build();
+    private static final MarshallingInfo<Integer> NUMBEROFBROKERNODES_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("numberOfBrokerNodes").build();
+
+    private static final MutableClusterInfoMarshaller instance = new MutableClusterInfoMarshaller();
+
+    public static MutableClusterInfoMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(MutableClusterInfo mutableClusterInfo, ProtocolMarshaller protocolMarshaller) {
+
+        if (mutableClusterInfo == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(mutableClusterInfo.getBrokerEBSVolumeInfo(), BROKEREBSVOLUMEINFO_BINDING);
+            protocolMarshaller.marshall(mutableClusterInfo.getConfigurationInfo(), CONFIGURATIONINFO_BINDING);
+            protocolMarshaller.marshall(mutableClusterInfo.getNumberOfBrokerNodes(), NUMBEROFBROKERNODES_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/TlsJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/TlsJsonUnmarshaller.java
new file mode 100644
index 000000000000..a4d4c1eda5e9
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/TlsJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Tls JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class TlsJsonUnmarshaller implements Unmarshaller<Tls, JsonUnmarshallerContext> {
+
+    public Tls unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Tls tls = new Tls();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("certificateAuthorityArnList", targetDepth)) {
+                    context.nextToken();
+                    tls.setCertificateAuthorityArnList(new ListUnmarshaller<String>(context.getUnmarshaller(String.class)).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return tls;
+    }
+
+    private static TlsJsonUnmarshaller instance;
+
+    public static TlsJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new TlsJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/TlsMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/TlsMarshaller.java
new file mode 100644
index 000000000000..31ad5dcb5257
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/TlsMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * TlsMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class TlsMarshaller {
+
+    private static final MarshallingInfo<List> CERTIFICATEAUTHORITYARNLIST_BINDING = MarshallingInfo.builder(MarshallingType.LIST)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("certificateAuthorityArnList").build();
+
+    private static final TlsMarshaller instance = new TlsMarshaller();
+
+    public static TlsMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Tls tls, ProtocolMarshaller protocolMarshaller) {
+
+        if (tls == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(tls.getCertificateAuthorityArnList(), CERTIFICATEAUTHORITYARNLIST_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageRequestMarshaller.java
new file mode 100644
index 000000000000..607779e1ef08
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageRequestMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateBrokerStorageRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateBrokerStorageRequestMarshaller {
+
+    private static final MarshallingInfo<String> CLUSTERARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("clusterArn").build();
+    private static final MarshallingInfo<String> CURRENTVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("currentVersion").build();
+    private static final MarshallingInfo<List> TARGETBROKEREBSVOLUMEINFO_BINDING = MarshallingInfo.builder(MarshallingType.LIST)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("targetBrokerEBSVolumeInfo").build();
+
+    private static final UpdateBrokerStorageRequestMarshaller instance = new UpdateBrokerStorageRequestMarshaller();
+
+    public static UpdateBrokerStorageRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UpdateBrokerStorageRequest updateBrokerStorageRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (updateBrokerStorageRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(updateBrokerStorageRequest.getClusterArn(), CLUSTERARN_BINDING);
+            protocolMarshaller.marshall(updateBrokerStorageRequest.getCurrentVersion(), CURRENTVERSION_BINDING);
+            protocolMarshaller.marshall(updateBrokerStorageRequest.getTargetBrokerEBSVolumeInfo(), TARGETBROKEREBSVOLUMEINFO_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageRequestProtocolMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..42d55e3dcbdc
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageRequestProtocolMarshaller.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateBrokerStorageRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateBrokerStorageRequestProtocolMarshaller implements Marshaller<Request<UpdateBrokerStorageRequest>, UpdateBrokerStorageRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/v1/clusters/{clusterArn}/nodes/storage").httpMethodName(HttpMethodName.PUT).hasExplicitPayloadMember(false).hasPayloadMembers(true)
+            .serviceName("AWSKafka").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public UpdateBrokerStorageRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<UpdateBrokerStorageRequest> marshall(UpdateBrokerStorageRequest updateBrokerStorageRequest) {
+
+        if (updateBrokerStorageRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<UpdateBrokerStorageRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    updateBrokerStorageRequest);
+
+            protocolMarshaller.startMarshalling();
+            UpdateBrokerStorageRequestMarshaller.getInstance().marshall(updateBrokerStorageRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageResultJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..da752a563b15
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateBrokerStorageResultJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UpdateBrokerStorageResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateBrokerStorageResultJsonUnmarshaller implements Unmarshaller<UpdateBrokerStorageResult, JsonUnmarshallerContext> {
+
+    public UpdateBrokerStorageResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UpdateBrokerStorageResult updateBrokerStorageResult = new UpdateBrokerStorageResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return updateBrokerStorageResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("clusterArn", targetDepth)) {
+                    context.nextToken();
+                    updateBrokerStorageResult.setClusterArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("clusterOperationArn", targetDepth)) {
+                    context.nextToken();
+                    updateBrokerStorageResult.setClusterOperationArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return updateBrokerStorageResult;
+    }
+
+    private static UpdateBrokerStorageResultJsonUnmarshaller instance;
+
+    public static UpdateBrokerStorageResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UpdateBrokerStorageResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationRequestMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationRequestMarshaller.java
new file mode 100644
index 000000000000..a72af5c39491
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.kafka.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateClusterConfigurationRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateClusterConfigurationRequestMarshaller {
+
+    private static final MarshallingInfo<String> CLUSTERARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PATH)
+            .marshallLocationName("clusterArn").build();
+    private static final MarshallingInfo<StructuredPojo> CONFIGURATIONINFO_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("configurationInfo").build();
+    private static final MarshallingInfo<String> CURRENTVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("currentVersion").build();
+
+    private static final UpdateClusterConfigurationRequestMarshaller instance = new UpdateClusterConfigurationRequestMarshaller();
+
+    public static UpdateClusterConfigurationRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UpdateClusterConfigurationRequest updateClusterConfigurationRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (updateClusterConfigurationRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(updateClusterConfigurationRequest.getClusterArn(), CLUSTERARN_BINDING);
+            protocolMarshaller.marshall(updateClusterConfigurationRequest.getConfigurationInfo(), CONFIGURATIONINFO_BINDING);
+            protocolMarshaller.marshall(updateClusterConfigurationRequest.getCurrentVersion(), CURRENTVERSION_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationRequestProtocolMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..39061f43e0f5
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationRequestProtocolMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateClusterConfigurationRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateClusterConfigurationRequestProtocolMarshaller implements
+        Marshaller<Request<UpdateClusterConfigurationRequest>, UpdateClusterConfigurationRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON)
+            .requestUri("/v1/clusters/{clusterArn}/configuration").httpMethodName(HttpMethodName.PUT).hasExplicitPayloadMember(false).hasPayloadMembers(true)
+            .serviceName("AWSKafka").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public UpdateClusterConfigurationRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<UpdateClusterConfigurationRequest> marshall(UpdateClusterConfigurationRequest updateClusterConfigurationRequest) {
+
+        if (updateClusterConfigurationRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<UpdateClusterConfigurationRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(
+                    SDK_OPERATION_BINDING, updateClusterConfigurationRequest);
+
+            protocolMarshaller.startMarshalling();
+            UpdateClusterConfigurationRequestMarshaller.getInstance().marshall(updateClusterConfigurationRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationResultJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..d696b8f81d36
--- /dev/null
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/UpdateClusterConfigurationResultJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.kafka.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.kafka.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UpdateClusterConfigurationResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateClusterConfigurationResultJsonUnmarshaller implements Unmarshaller<UpdateClusterConfigurationResult, JsonUnmarshallerContext> {
+
+    public UpdateClusterConfigurationResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UpdateClusterConfigurationResult updateClusterConfigurationResult = new UpdateClusterConfigurationResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return updateClusterConfigurationResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("clusterArn", targetDepth)) {
+                    context.nextToken();
+                    updateClusterConfigurationResult.setClusterArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("clusterOperationArn", targetDepth)) {
+                    context.nextToken();
+                    updateClusterConfigurationResult.setClusterOperationArn(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return updateClusterConfigurationResult;
+    }
+
+    private static UpdateClusterConfigurationResultJsonUnmarshaller instance;
+
+    public static UpdateClusterConfigurationResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UpdateClusterConfigurationResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoJsonUnmarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoJsonUnmarshaller.java
index 52b10800a8a8..29df6ebf69cc 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoJsonUnmarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoJsonUnmarshaller.java
@@ -56,6 +56,10 @@ public ZookeeperNodeInfo unmarshall(JsonUnmarshallerContext context) throws Exce
                     context.nextToken();
                     zookeeperNodeInfo.setClientVpcIpAddress(context.getUnmarshaller(String.class).unmarshall(context));
                 }
+                if (context.testExpression("endpoints", targetDepth)) {
+                    context.nextToken();
+                    zookeeperNodeInfo.setEndpoints(new ListUnmarshaller<String>(context.getUnmarshaller(String.class)).unmarshall(context));
+                }
                 if (context.testExpression("zookeeperId", targetDepth)) {
                     context.nextToken();
                     zookeeperNodeInfo.setZookeeperId(context.getUnmarshaller(Double.class).unmarshall(context));
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoMarshaller.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoMarshaller.java
index 8a5bfbde56cf..3640f6653b22 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoMarshaller.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/model/transform/ZookeeperNodeInfoMarshaller.java
@@ -12,6 +12,7 @@
  */
 package com.amazonaws.services.kafka.model.transform;
 
+import java.util.List;
 import javax.annotation.Generated;
 
 import com.amazonaws.SdkClientException;
@@ -31,6 +32,8 @@ public class ZookeeperNodeInfoMarshaller {
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("attachedENIId").build();
     private static final MarshallingInfo<String> CLIENTVPCIPADDRESS_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("clientVpcIpAddress").build();
+    private static final MarshallingInfo<List> ENDPOINTS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("endpoints").build();
     private static final MarshallingInfo<Double> ZOOKEEPERID_BINDING = MarshallingInfo.builder(MarshallingType.DOUBLE)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("zookeeperId").build();
     private static final MarshallingInfo<String> ZOOKEEPERVERSION_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
@@ -54,6 +57,7 @@ public void marshall(ZookeeperNodeInfo zookeeperNodeInfo, ProtocolMarshaller pro
         try {
             protocolMarshaller.marshall(zookeeperNodeInfo.getAttachedENIId(), ATTACHEDENIID_BINDING);
             protocolMarshaller.marshall(zookeeperNodeInfo.getClientVpcIpAddress(), CLIENTVPCIPADDRESS_BINDING);
+            protocolMarshaller.marshall(zookeeperNodeInfo.getEndpoints(), ENDPOINTS_BINDING);
             protocolMarshaller.marshall(zookeeperNodeInfo.getZookeeperId(), ZOOKEEPERID_BINDING);
             protocolMarshaller.marshall(zookeeperNodeInfo.getZookeeperVersion(), ZOOKEEPERVERSION_BINDING);
         } catch (Exception e) {
diff --git a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/package-info.java b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/package-info.java
index 06b184fbd23c..156e4df5eb08 100644
--- a/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/package-info.java
+++ b/aws-java-sdk-kafka/src/main/java/com/amazonaws/services/kafka/package-info.java
@@ -12,7 +12,8 @@
  */
 
 /**
- * <p>
+ * 
+ <p>
  * The operations for managing an Amazon MSK cluster.
  * </p>
  */
diff --git a/aws-java-sdk-kinesis/pom.xml b/aws-java-sdk-kinesis/pom.xml
index 9f58db97878a..4f5a9fa1a309 100644
--- a/aws-java-sdk-kinesis/pom.xml
+++ b/aws-java-sdk-kinesis/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-kinesis</artifactId>
diff --git a/aws-java-sdk-kinesisanalyticsv2/pom.xml b/aws-java-sdk-kinesisanalyticsv2/pom.xml
index 1a278ac783ad..269e6d01923d 100644
--- a/aws-java-sdk-kinesisanalyticsv2/pom.xml
+++ b/aws-java-sdk-kinesisanalyticsv2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-kinesisanalyticsv2</artifactId>
diff --git a/aws-java-sdk-kinesisvideo/pom.xml b/aws-java-sdk-kinesisvideo/pom.xml
index bd472bf2d562..bab4ffab4675 100644
--- a/aws-java-sdk-kinesisvideo/pom.xml
+++ b/aws-java-sdk-kinesisvideo/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-kinesisvideo</artifactId>
diff --git a/aws-java-sdk-kms/pom.xml b/aws-java-sdk-kms/pom.xml
index bd2c59954125..754c5c6116e6 100644
--- a/aws-java-sdk-kms/pom.xml
+++ b/aws-java-sdk-kms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-kms</artifactId>
diff --git a/aws-java-sdk-lambda/pom.xml b/aws-java-sdk-lambda/pom.xml
index 1fc9fb6fb4ac..ab58462e227c 100644
--- a/aws-java-sdk-lambda/pom.xml
+++ b/aws-java-sdk-lambda/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-lambda</artifactId>
diff --git a/aws-java-sdk-lex/pom.xml b/aws-java-sdk-lex/pom.xml
index 2e847463aca4..07ac6353428c 100644
--- a/aws-java-sdk-lex/pom.xml
+++ b/aws-java-sdk-lex/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-lex</artifactId>
diff --git a/aws-java-sdk-lexmodelbuilding/pom.xml b/aws-java-sdk-lexmodelbuilding/pom.xml
index 1c0aa121d65d..86e1fd272c7f 100644
--- a/aws-java-sdk-lexmodelbuilding/pom.xml
+++ b/aws-java-sdk-lexmodelbuilding/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-lexmodelbuilding</artifactId>
diff --git a/aws-java-sdk-licensemanager/pom.xml b/aws-java-sdk-licensemanager/pom.xml
index 3b5ee3cf447e..40151c8e4871 100644
--- a/aws-java-sdk-licensemanager/pom.xml
+++ b/aws-java-sdk-licensemanager/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-licensemanager</artifactId>
diff --git a/aws-java-sdk-lightsail/pom.xml b/aws-java-sdk-lightsail/pom.xml
index 8945c409bb52..774140ddb004 100644
--- a/aws-java-sdk-lightsail/pom.xml
+++ b/aws-java-sdk-lightsail/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-lightsail</artifactId>
diff --git a/aws-java-sdk-logs/pom.xml b/aws-java-sdk-logs/pom.xml
index 477ea21cd185..efced2bfa31d 100644
--- a/aws-java-sdk-logs/pom.xml
+++ b/aws-java-sdk-logs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-logs</artifactId>
diff --git a/aws-java-sdk-machinelearning/pom.xml b/aws-java-sdk-machinelearning/pom.xml
index d7e9fd2f7cb9..fd49fc4eef5d 100644
--- a/aws-java-sdk-machinelearning/pom.xml
+++ b/aws-java-sdk-machinelearning/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-machinelearning</artifactId>
diff --git a/aws-java-sdk-macie/pom.xml b/aws-java-sdk-macie/pom.xml
index b1ba6aeccec5..7be8c2bb85a9 100644
--- a/aws-java-sdk-macie/pom.xml
+++ b/aws-java-sdk-macie/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-macie</artifactId>
diff --git a/aws-java-sdk-managedblockchain/pom.xml b/aws-java-sdk-managedblockchain/pom.xml
index ea738a627b5c..0e451ac7b9a4 100644
--- a/aws-java-sdk-managedblockchain/pom.xml
+++ b/aws-java-sdk-managedblockchain/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-managedblockchain</artifactId>
diff --git a/aws-java-sdk-marketplacecommerceanalytics/pom.xml b/aws-java-sdk-marketplacecommerceanalytics/pom.xml
index 93fe82ff5241..a87ac9cf15cb 100644
--- a/aws-java-sdk-marketplacecommerceanalytics/pom.xml
+++ b/aws-java-sdk-marketplacecommerceanalytics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-marketplacecommerceanalytics</artifactId>
diff --git a/aws-java-sdk-marketplaceentitlement/pom.xml b/aws-java-sdk-marketplaceentitlement/pom.xml
index 46b925c8c76c..a3454d464ee5 100644
--- a/aws-java-sdk-marketplaceentitlement/pom.xml
+++ b/aws-java-sdk-marketplaceentitlement/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-marketplaceentitlement</artifactId>
diff --git a/aws-java-sdk-marketplacemeteringservice/pom.xml b/aws-java-sdk-marketplacemeteringservice/pom.xml
index 761e6fd82171..34ebd482a289 100644
--- a/aws-java-sdk-marketplacemeteringservice/pom.xml
+++ b/aws-java-sdk-marketplacemeteringservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-marketplacemeteringservice</artifactId>
diff --git a/aws-java-sdk-mechanicalturkrequester/pom.xml b/aws-java-sdk-mechanicalturkrequester/pom.xml
index 26f1c3e48f2b..371ee47b0171 100644
--- a/aws-java-sdk-mechanicalturkrequester/pom.xml
+++ b/aws-java-sdk-mechanicalturkrequester/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mechanicalturkrequester</artifactId>
diff --git a/aws-java-sdk-mediaconnect/pom.xml b/aws-java-sdk-mediaconnect/pom.xml
index 3ee13e215746..37133670bf0d 100644
--- a/aws-java-sdk-mediaconnect/pom.xml
+++ b/aws-java-sdk-mediaconnect/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediaconnect</artifactId>
diff --git a/aws-java-sdk-mediaconvert/pom.xml b/aws-java-sdk-mediaconvert/pom.xml
index e88b2183683f..2dab382b2e7a 100644
--- a/aws-java-sdk-mediaconvert/pom.xml
+++ b/aws-java-sdk-mediaconvert/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediaconvert</artifactId>
diff --git a/aws-java-sdk-medialive/pom.xml b/aws-java-sdk-medialive/pom.xml
index be47a4750941..e017521b3f38 100644
--- a/aws-java-sdk-medialive/pom.xml
+++ b/aws-java-sdk-medialive/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-medialive</artifactId>
diff --git a/aws-java-sdk-mediapackage/pom.xml b/aws-java-sdk-mediapackage/pom.xml
index f3a568778e2b..b69c945a67e9 100644
--- a/aws-java-sdk-mediapackage/pom.xml
+++ b/aws-java-sdk-mediapackage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediapackage</artifactId>
diff --git a/aws-java-sdk-mediapackagevod/pom.xml b/aws-java-sdk-mediapackagevod/pom.xml
index bc3ebcff826c..d3d2fac26b4b 100644
--- a/aws-java-sdk-mediapackagevod/pom.xml
+++ b/aws-java-sdk-mediapackagevod/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediapackagevod</artifactId>
diff --git a/aws-java-sdk-mediastore/pom.xml b/aws-java-sdk-mediastore/pom.xml
index e356d66e059e..25877192ec00 100644
--- a/aws-java-sdk-mediastore/pom.xml
+++ b/aws-java-sdk-mediastore/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediastore</artifactId>
diff --git a/aws-java-sdk-mediastoredata/pom.xml b/aws-java-sdk-mediastoredata/pom.xml
index e91efe468e33..6640cf17796c 100644
--- a/aws-java-sdk-mediastoredata/pom.xml
+++ b/aws-java-sdk-mediastoredata/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediastoredata</artifactId>
diff --git a/aws-java-sdk-mediatailor/pom.xml b/aws-java-sdk-mediatailor/pom.xml
index 7c6b7008853e..8e89b4765385 100644
--- a/aws-java-sdk-mediatailor/pom.xml
+++ b/aws-java-sdk-mediatailor/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mediatailor</artifactId>
diff --git a/aws-java-sdk-migrationhub/pom.xml b/aws-java-sdk-migrationhub/pom.xml
index 667e23898088..6a88925345d3 100644
--- a/aws-java-sdk-migrationhub/pom.xml
+++ b/aws-java-sdk-migrationhub/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-migrationhub</artifactId>
diff --git a/aws-java-sdk-mobile/pom.xml b/aws-java-sdk-mobile/pom.xml
index 4a1c48806310..0c7e80904d13 100644
--- a/aws-java-sdk-mobile/pom.xml
+++ b/aws-java-sdk-mobile/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mobile</artifactId>
diff --git a/aws-java-sdk-models/pom.xml b/aws-java-sdk-models/pom.xml
index f1d25b856a4a..99c23cd75f87 100644
--- a/aws-java-sdk-models/pom.xml
+++ b/aws-java-sdk-models/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-models</artifactId>
diff --git a/aws-java-sdk-models/src/main/resources/models/a4b-2017-11-09-intermediate.json b/aws-java-sdk-models/src/main/resources/models/a4b-2017-11-09-intermediate.json
index a1f1c68f8236..9937545132cc 100644
--- a/aws-java-sdk-models/src/main/resources/models/a4b-2017-11-09-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/a4b-2017-11-09-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/acm-pca-2017-08-22-intermediate.json b/aws-java-sdk-models/src/main/resources/models/acm-pca-2017-08-22-intermediate.json
index 46c6a246be22..4b5b7e9557a0 100644
--- a/aws-java-sdk-models/src/main/resources/models/acm-pca-2017-08-22-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/acm-pca-2017-08-22-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/api.sagemaker-2017-07-24-intermediate.json b/aws-java-sdk-models/src/main/resources/models/api.sagemaker-2017-07-24-intermediate.json
index 7dfeb41675a7..0167d99cddf2 100644
--- a/aws-java-sdk-models/src/main/resources/models/api.sagemaker-2017-07-24-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/api.sagemaker-2017-07-24-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/athena-2017-05-18-intermediate.json b/aws-java-sdk-models/src/main/resources/models/athena-2017-05-18-intermediate.json
index 5c606f80762d..6063c5827091 100644
--- a/aws-java-sdk-models/src/main/resources/models/athena-2017-05-18-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/athena-2017-05-18-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : {
       "ColumnInfo" : [ "Nullable" ],
       "EncryptionConfiguration" : [ "EncryptionOption" ],
diff --git a/aws-java-sdk-models/src/main/resources/models/cloudhsmv2-2017-04-28-intermediate.json b/aws-java-sdk-models/src/main/resources/models/cloudhsmv2-2017-04-28-intermediate.json
index 10e694ca4d40..941ad71f12bf 100644
--- a/aws-java-sdk-models/src/main/resources/models/cloudhsmv2-2017-04-28-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/cloudhsmv2-2017-04-28-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-intermediate.json b/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-intermediate.json
index ae2a557472a3..9d3410c2749f 100644
--- a/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-intermediate.json
@@ -58,7 +58,7 @@
     "defaultEndpoint" : "https://codecommit.us-east-1.amazonaws.com",
     "defaultEndpointWithoutHttpProtocol" : "codecommit.us-east-1.amazonaws.com",
     "defaultRegion" : null,
-    "documentation" : "<fullname>AWS CodeCommit</fullname> <p>This is the <i>AWS CodeCommit API Reference</i>. This reference provides descriptions of the operations and data types for AWS CodeCommit API along with usage examples.</p> <p>You can use the AWS CodeCommit API to work with the following objects:</p> <p>Repositories, by calling the following:</p> <ul> <li> <p> <a>BatchGetRepositories</a>, which returns information about one or more repositories associated with your AWS account.</p> </li> <li> <p> <a>CreateRepository</a>, which creates an AWS CodeCommit repository.</p> </li> <li> <p> <a>DeleteRepository</a>, which deletes an AWS CodeCommit repository.</p> </li> <li> <p> <a>GetRepository</a>, which returns information about a specified repository.</p> </li> <li> <p> <a>ListRepositories</a>, which lists all AWS CodeCommit repositories associated with your AWS account.</p> </li> <li> <p> <a>UpdateRepositoryDescription</a>, which sets or updates the description of the repository.</p> </li> <li> <p> <a>UpdateRepositoryName</a>, which changes the name of the repository. If you change the name of a repository, no other users of that repository will be able to access it until you send them the new HTTPS or SSH URL to use.</p> </li> </ul> <p>Branches, by calling the following:</p> <ul> <li> <p> <a>CreateBranch</a>, which creates a new branch in a specified repository.</p> </li> <li> <p> <a>DeleteBranch</a>, which deletes the specified branch in a repository unless it is the default branch.</p> </li> <li> <p> <a>GetBranch</a>, which returns information about a specified branch.</p> </li> <li> <p> <a>ListBranches</a>, which lists all branches for a specified repository.</p> </li> <li> <p> <a>UpdateDefaultBranch</a>, which changes the default branch for a repository.</p> </li> </ul> <p>Files, by calling the following:</p> <ul> <li> <p> <a>DeleteFile</a>, which deletes the content of a specified file from a specified branch.</p> </li> <li> <p> <a>GetFile</a>, which returns the base-64 encoded content of a specified file.</p> </li> <li> <p> <a>GetFolder</a>, which returns the contents of a specified folder or directory.</p> </li> <li> <p> <a>PutFile</a>, which adds or modifies a file in a specified repository and branch.</p> </li> </ul> <p>Information about committed code in a repository, by calling the following:</p> <ul> <li> <p> <a>CreateCommit</a>, which creates a commit for changes to a repository.</p> </li> <li> <p> <a>GetBlob</a>, which returns the base-64 encoded content of an individual Git blob object within a repository.</p> </li> <li> <p> <a>GetCommit</a>, which returns information about a commit, including commit messages and author and committer information.</p> </li> <li> <p> <a>GetDifferences</a>, which returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID or other fully qualified reference).</p> </li> </ul> <p>Pull requests, by calling the following:</p> <ul> <li> <p> <a>CreatePullRequest</a>, which creates a pull request in a specified repository.</p> </li> <li> <p> <a>DescribePullRequestEvents</a>, which returns information about one or more pull request events.</p> </li> <li> <p> <a>GetCommentsForPullRequest</a>, which returns information about comments on a specified pull request.</p> </li> <li> <p> <a>GetMergeConflicts</a>, which returns information about merge conflicts between the source and destination branch in a pull request.</p> </li> <li> <p> <a>GetPullRequest</a>, which returns information about a specified pull request.</p> </li> <li> <p> <a>ListPullRequests</a>, which lists all pull requests for a repository.</p> </li> <li> <p> <a>MergePullRequestByFastForward</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the fast-forward merge option.</p> </li> <li> <p> <a>PostCommentForPullRequest</a>, which posts a comment to a pull request at the specified line, file, or request.</p> </li> <li> <p> <a>UpdatePullRequestDescription</a>, which updates the description of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestStatus</a>, which updates the status of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestTitle</a>, which updates the title of a pull request.</p> </li> </ul> <p>Information about comments in a repository, by calling the following:</p> <ul> <li> <p> <a>DeleteCommentContent</a>, which deletes the content of a comment on a commit in a repository.</p> </li> <li> <p> <a>GetComment</a>, which returns information about a comment on a commit.</p> </li> <li> <p> <a>GetCommentsForComparedCommit</a>, which returns information about comments on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentForComparedCommit</a>, which creates a comment on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentReply</a>, which creates a reply to a comment.</p> </li> <li> <p> <a>UpdateComment</a>, which updates the content of a comment on a commit in a repository.</p> </li> </ul> <p>Triggers, by calling the following:</p> <ul> <li> <p> <a>GetRepositoryTriggers</a>, which returns information about triggers configured for a repository.</p> </li> <li> <p> <a>PutRepositoryTriggers</a>, which replaces all triggers for a repository and can be used to create or delete triggers.</p> </li> <li> <p> <a>TestRepositoryTriggers</a>, which tests the functionality of a repository trigger by sending data to the trigger target.</p> </li> </ul> <p>For information about how to use AWS CodeCommit, see the <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit User Guide</a>.</p>",
+    "documentation" : "<fullname>AWS CodeCommit</fullname> <p>This is the <i>AWS CodeCommit API Reference</i>. This reference provides descriptions of the operations and data types for AWS CodeCommit API along with usage examples.</p> <p>You can use the AWS CodeCommit API to work with the following objects:</p> <p>Repositories, by calling the following:</p> <ul> <li> <p> <a>BatchGetRepositories</a>, which returns information about one or more repositories associated with your AWS account.</p> </li> <li> <p> <a>CreateRepository</a>, which creates an AWS CodeCommit repository.</p> </li> <li> <p> <a>DeleteRepository</a>, which deletes an AWS CodeCommit repository.</p> </li> <li> <p> <a>GetRepository</a>, which returns information about a specified repository.</p> </li> <li> <p> <a>ListRepositories</a>, which lists all AWS CodeCommit repositories associated with your AWS account.</p> </li> <li> <p> <a>UpdateRepositoryDescription</a>, which sets or updates the description of the repository.</p> </li> <li> <p> <a>UpdateRepositoryName</a>, which changes the name of the repository. If you change the name of a repository, no other users of that repository will be able to access it until you send them the new HTTPS or SSH URL to use.</p> </li> </ul> <p>Branches, by calling the following:</p> <ul> <li> <p> <a>CreateBranch</a>, which creates a new branch in a specified repository.</p> </li> <li> <p> <a>DeleteBranch</a>, which deletes the specified branch in a repository unless it is the default branch.</p> </li> <li> <p> <a>GetBranch</a>, which returns information about a specified branch.</p> </li> <li> <p> <a>ListBranches</a>, which lists all branches for a specified repository.</p> </li> <li> <p> <a>UpdateDefaultBranch</a>, which changes the default branch for a repository.</p> </li> </ul> <p>Files, by calling the following:</p> <ul> <li> <p> <a>DeleteFile</a>, which deletes the content of a specified file from a specified branch.</p> </li> <li> <p> <a>GetFile</a>, which returns the base-64 encoded content of a specified file.</p> </li> <li> <p> <a>GetFolder</a>, which returns the contents of a specified folder or directory.</p> </li> <li> <p> <a>PutFile</a>, which adds or modifies a file in a specified repository and branch.</p> </li> </ul> <p>Information about committed code in a repository, by calling the following:</p> <ul> <li> <p> <a>CreateCommit</a>, which creates a commit for changes to a repository.</p> </li> <li> <p> <a>GetBlob</a>, which returns the base-64 encoded content of an individual Git blob object within a repository.</p> </li> <li> <p> <a>GetCommit</a>, which returns information about a commit, including commit messages and author and committer information.</p> </li> <li> <p> <a>GetDifferences</a>, which returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID or other fully qualified reference).</p> </li> </ul> <p>Pull requests, by calling the following:</p> <ul> <li> <p> <a>CreatePullRequest</a>, which creates a pull request in a specified repository.</p> </li> <li> <p> <a>DescribePullRequestEvents</a>, which returns information about one or more pull request events.</p> </li> <li> <p> <a>GetCommentsForPullRequest</a>, which returns information about comments on a specified pull request.</p> </li> <li> <p> <a>GetMergeConflicts</a>, which returns information about merge conflicts between the source and destination branch in a pull request.</p> </li> <li> <p> <a>GetPullRequest</a>, which returns information about a specified pull request.</p> </li> <li> <p> <a>ListPullRequests</a>, which lists all pull requests for a repository.</p> </li> <li> <p> <a>MergePullRequestByFastForward</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the fast-forward merge option.</p> </li> <li> <p> <a>PostCommentForPullRequest</a>, which posts a comment to a pull request at the specified line, file, or request.</p> </li> <li> <p> <a>UpdatePullRequestDescription</a>, which updates the description of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestStatus</a>, which updates the status of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestTitle</a>, which updates the title of a pull request.</p> </li> </ul> <p>Information about comments in a repository, by calling the following:</p> <ul> <li> <p> <a>DeleteCommentContent</a>, which deletes the content of a comment on a commit in a repository.</p> </li> <li> <p> <a>GetComment</a>, which returns information about a comment on a commit.</p> </li> <li> <p> <a>GetCommentsForComparedCommit</a>, which returns information about comments on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentForComparedCommit</a>, which creates a comment on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentReply</a>, which creates a reply to a comment.</p> </li> <li> <p> <a>UpdateComment</a>, which updates the content of a comment on a commit in a repository.</p> </li> </ul> <p>Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:</p> <ul> <li> <p> <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit.</p> </li> <li> <p> <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.</p> </li> <li> <p> <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.</p> </li> </ul> <p>Triggers, by calling the following:</p> <ul> <li> <p> <a>GetRepositoryTriggers</a>, which returns information about triggers configured for a repository.</p> </li> <li> <p> <a>PutRepositoryTriggers</a>, which replaces all triggers for a repository and can be used to create or delete triggers.</p> </li> <li> <p> <a>TestRepositoryTriggers</a>, which tests the functionality of a repository trigger by sending data to the trigger target.</p> </li> </ul> <p>For information about how to use AWS CodeCommit, see the <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit User Guide</a>.</p>",
     "endpointPrefix" : "codecommit",
     "hasApiWithStreamInput" : false,
     "ionProtocol" : false,
@@ -606,6 +606,22 @@
         "exceptionName" : "EncryptionKeyUnavailableException",
         "documentation" : "<p>The encryption key is not available.</p>",
         "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidTagsMapException",
+        "documentation" : "<p>The map of tags is not valid.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TooManyTagsException",
+        "documentation" : "<p>The maximum number of tags for an AWS CodeCommit resource has been exceeded.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidSystemTagUsageException",
+        "documentation" : "<p>The specified tag is not valid. Key names cannot be prefixed with aws:.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TagPolicyException",
+        "documentation" : "<p>The tag policy is not valid.</p>",
+        "httpStatusCode" : null
       } ],
       "hasBlobMemberAsPayload" : false,
       "hostPrefixProcessor" : null,
@@ -1072,7 +1088,7 @@
         "httpStatusCode" : null
       }, {
         "exceptionName" : "FileTooLargeException",
-        "documentation" : "<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
+        "documentation" : "<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
         "httpStatusCode" : null
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -1640,7 +1656,7 @@
         "httpStatusCode" : null
       }, {
         "exceptionName" : "FileTooLargeException",
-        "documentation" : "<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
+        "documentation" : "<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
         "httpStatusCode" : null
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -2231,6 +2247,54 @@
       },
       "syncReturnType" : "ListRepositoriesResult"
     },
+    "ListTagsForResource" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListTagsForResourceResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListTagsForResourceResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult>",
+      "asyncReturnType" : "ListTagsForResourceResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "RepositoryDoesNotExistException",
+        "documentation" : "<p>The specified repository does not exist.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidRepositoryNameException",
+        "documentation" : "<p>At least one specified repository name is not valid.</p> <note> <p>This exception only occurs when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist.</p> </note>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "ResourceArnRequiredException",
+        "documentation" : "<p>A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidResourceArnException",
+        "documentation" : "<p>The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+        "httpStatusCode" : null
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListTagsForResourceRequest",
+        "variableName" : "listTagsForResourceRequest",
+        "variableType" : "ListTagsForResourceRequest",
+        "documentation" : "",
+        "simpleType" : "ListTagsForResourceRequest",
+        "variableSetterType" : "ListTagsForResourceRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listTagsForResource",
+      "operationName" : "ListTagsForResource",
+      "returnType" : {
+        "returnType" : "ListTagsForResourceResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListTagsForResourceResult"
+    },
     "MergePullRequestByFastForward" : {
       "asyncCallableType" : "java.util.concurrent.Callable<MergePullRequestByFastForwardResult>",
       "asyncFutureType" : "java.util.concurrent.Future<MergePullRequestByFastForwardResult>",
@@ -2927,6 +2991,74 @@
       },
       "syncReturnType" : "PutRepositoryTriggersResult"
     },
+    "TagResource" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<TagResourceResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<TagResourceResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult>",
+      "asyncReturnType" : "TagResourceResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "RepositoryDoesNotExistException",
+        "documentation" : "<p>The specified repository does not exist.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidRepositoryNameException",
+        "documentation" : "<p>At least one specified repository name is not valid.</p> <note> <p>This exception only occurs when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist.</p> </note>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "ResourceArnRequiredException",
+        "documentation" : "<p>A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidResourceArnException",
+        "documentation" : "<p>The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TagsMapRequiredException",
+        "documentation" : "<p>A map of tags is required.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidTagsMapException",
+        "documentation" : "<p>The map of tags is not valid.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TooManyTagsException",
+        "documentation" : "<p>The maximum number of tags for an AWS CodeCommit resource has been exceeded.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidSystemTagUsageException",
+        "documentation" : "<p>The specified tag is not valid. Key names cannot be prefixed with aws:.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TagPolicyException",
+        "documentation" : "<p>The tag policy is not valid.</p>",
+        "httpStatusCode" : null
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceRequest",
+        "variableName" : "tagResourceRequest",
+        "variableType" : "TagResourceRequest",
+        "documentation" : "",
+        "simpleType" : "TagResourceRequest",
+        "variableSetterType" : "TagResourceRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "tagResource",
+      "operationName" : "TagResource",
+      "returnType" : {
+        "returnType" : "TagResourceResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "TagResourceResult"
+    },
     "TestRepositoryTriggers" : {
       "asyncCallableType" : "java.util.concurrent.Callable<TestRepositoryTriggersResult>",
       "asyncFutureType" : "java.util.concurrent.Future<TestRepositoryTriggersResult>",
@@ -3043,6 +3175,74 @@
       },
       "syncReturnType" : "TestRepositoryTriggersResult"
     },
+    "UntagResource" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<UntagResourceResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<UntagResourceResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult>",
+      "asyncReturnType" : "UntagResourceResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "RepositoryDoesNotExistException",
+        "documentation" : "<p>The specified repository does not exist.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidRepositoryNameException",
+        "documentation" : "<p>At least one specified repository name is not valid.</p> <note> <p>This exception only occurs when a specified repository name is not valid. Other exceptions occur when a required repository parameter is missing, or when a specified repository does not exist.</p> </note>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "ResourceArnRequiredException",
+        "documentation" : "<p>A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidResourceArnException",
+        "documentation" : "<p>The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TagKeysListRequiredException",
+        "documentation" : "<p>A list of tag keys is required. The list cannot be empty or null.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidTagKeysListException",
+        "documentation" : "<p>The list of tags is not valid.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TooManyTagsException",
+        "documentation" : "<p>The maximum number of tags for an AWS CodeCommit resource has been exceeded.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "InvalidSystemTagUsageException",
+        "documentation" : "<p>The specified tag is not valid. Key names cannot be prefixed with aws:.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "TagPolicyException",
+        "documentation" : "<p>The tag policy is not valid.</p>",
+        "httpStatusCode" : null
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceRequest",
+        "variableName" : "untagResourceRequest",
+        "variableType" : "UntagResourceRequest",
+        "documentation" : "",
+        "simpleType" : "UntagResourceRequest",
+        "variableSetterType" : "UntagResourceRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "untagResource",
+      "operationName" : "UntagResource",
+      "returnType" : {
+        "returnType" : "UntagResourceResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "UntagResourceResult"
+    },
     "UpdateComment" : {
       "asyncCallableType" : "java.util.concurrent.Callable<UpdateCommentResult>",
       "asyncFutureType" : "java.util.concurrent.Future<UpdateCommentResult>",
@@ -3438,7 +3638,7 @@
       "asyncReturnType" : "UpdateRepositoryNameResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. The suffix \".git\" is prohibited. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide.</p>",
+      "documentation" : "<p>Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. The suffix \".git\" is prohibited. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide.</p>",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
@@ -15328,11 +15528,11 @@
         "c2jName" : "repositoryName",
         "c2jShape" : "RepositoryName",
         "deprecated" : false,
-        "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
+        "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withRepositoryName",
-        "getterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@return The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
+        "getterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@return The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
         "getterMethodName" : "getRepositoryName",
         "getterModel" : {
           "returnType" : "String",
@@ -15366,7 +15566,7 @@
         "marshallingType" : "STRING",
         "name" : "RepositoryName",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
+        "setterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
         "setterMethodName" : "setRepositoryName",
         "setterModel" : {
           "timestampFormat" : null,
@@ -15380,13 +15580,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "repositoryName",
           "variableType" : "String",
-          "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
+          "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -15458,6 +15658,155 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tags",
+        "c2jShape" : "TagsMap",
+        "deprecated" : false,
+        "documentation" : "<p>One or more tag key-value pairs to use when tagging this repository.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@param tags One or more tag key-value pairs to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@return One or more tag key-value pairs to use when tagging this repository.*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.Map<String,String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "TagValue",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getValue",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "value",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "value",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Value",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
+        },
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@param tags One or more tag key-value pairs to use when tagging this repository.*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@param tags One or more tag key-value pairs to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "<p>One or more tag key-value pairs to use when tagging this repository.</p>",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
         "RepositoryDescription" : {
@@ -15532,11 +15881,11 @@
           "c2jName" : "repositoryName",
           "c2jShape" : "RepositoryName",
           "deprecated" : false,
-          "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
+          "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withRepositoryName",
-          "getterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@return The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
+          "getterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@return The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
           "getterMethodName" : "getRepositoryName",
           "getterModel" : {
             "returnType" : "String",
@@ -15570,7 +15919,7 @@
           "marshallingType" : "STRING",
           "name" : "RepositoryName",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
+          "setterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>*/",
           "setterMethodName" : "setRepositoryName",
           "setterModel" : {
             "timestampFormat" : null,
@@ -15584,17 +15933,167 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>\n@param repositoryName The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "repositoryName",
             "variableType" : "String",
-            "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
+            "documentation" : "<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "TagsMap",
+          "deprecated" : false,
+          "documentation" : "<p>One or more tag key-value pairs to use when tagging this repository.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@param tags One or more tag key-value pairs to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@return One or more tag key-value pairs to use when tagging this repository.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.Map<String,String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "TagValue",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getValue",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "value",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "value",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
+          },
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@param tags One or more tag key-value pairs to use when tagging this repository.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>One or more tag key-value pairs to use when tagging this repository.</p>\n@param tags One or more tag key-value pairs to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "<p>One or more tag key-value pairs to use when tagging this repository.</p>",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
@@ -22188,7 +22687,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
+      "documentation" : "<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
       "enums" : null,
       "errorCode" : "FileTooLargeException",
       "hasHeaderMember" : false,
@@ -35744,6 +36243,44 @@
       },
       "wrapper" : false
     },
+    "InvalidResourceArnException" : {
+      "c2jName" : "InvalidResourceArnException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "enums" : null,
+      "errorCode" : "InvalidResourceArnException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InvalidResourceArnException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InvalidResourceArnException",
+        "variableName" : "invalidResourceArnException",
+        "variableType" : "InvalidResourceArnException",
+        "documentation" : null,
+        "simpleType" : "InvalidResourceArnException",
+        "variableSetterType" : "InvalidResourceArnException"
+      },
+      "wrapper" : false
+    },
     "InvalidSortByException" : {
       "c2jName" : "InvalidSortByException",
       "customization" : {
@@ -35820,6 +36357,120 @@
       },
       "wrapper" : false
     },
+    "InvalidSystemTagUsageException" : {
+      "c2jName" : "InvalidSystemTagUsageException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The specified tag is not valid. Key names cannot be prefixed with aws:.</p>",
+      "enums" : null,
+      "errorCode" : "InvalidSystemTagUsageException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InvalidSystemTagUsageException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InvalidSystemTagUsageException",
+        "variableName" : "invalidSystemTagUsageException",
+        "variableType" : "InvalidSystemTagUsageException",
+        "documentation" : null,
+        "simpleType" : "InvalidSystemTagUsageException",
+        "variableSetterType" : "InvalidSystemTagUsageException"
+      },
+      "wrapper" : false
+    },
+    "InvalidTagKeysListException" : {
+      "c2jName" : "InvalidTagKeysListException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The list of tags is not valid.</p>",
+      "enums" : null,
+      "errorCode" : "InvalidTagKeysListException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InvalidTagKeysListException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InvalidTagKeysListException",
+        "variableName" : "invalidTagKeysListException",
+        "variableType" : "InvalidTagKeysListException",
+        "documentation" : null,
+        "simpleType" : "InvalidTagKeysListException",
+        "variableSetterType" : "InvalidTagKeysListException"
+      },
+      "wrapper" : false
+    },
+    "InvalidTagsMapException" : {
+      "c2jName" : "InvalidTagsMapException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The map of tags is not valid.</p>",
+      "enums" : null,
+      "errorCode" : "InvalidTagsMapException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InvalidTagsMapException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InvalidTagsMapException",
+        "variableName" : "invalidTagsMapException",
+        "variableType" : "InvalidTagsMapException",
+        "documentation" : null,
+        "simpleType" : "InvalidTagsMapException",
+        "variableSetterType" : "InvalidTagsMapException"
+      },
+      "wrapper" : false
+    },
     "InvalidTargetException" : {
       "c2jName" : "InvalidTargetException",
       "customization" : {
@@ -38193,7 +38844,867 @@
           "marshallingType" : "STRING",
           "name" : "NextToken",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+          "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : true,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Order" : {
+          "c2jName" : "order",
+          "c2jShape" : "OrderEnum",
+          "deprecated" : false,
+          "documentation" : "<p>The order in which to sort the results of a list repositories operation.</p>",
+          "enumType" : "OrderEnum",
+          "fluentSetterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@param order The order in which to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see OrderEnum*/",
+          "fluentSetterMethodName" : "withOrder",
+          "getterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@return The order in which to sort the results of a list repositories operation.\n@see OrderEnum*/",
+          "getterMethodName" : "getOrder",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "order",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "order",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Order",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@param order The order in which to sort the results of a list repositories operation.\n@see OrderEnum*/",
+          "setterMethodName" : "setOrder",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "order",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : true,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@param order The order in which to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see OrderEnum*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "order",
+            "variableType" : "String",
+            "documentation" : "<p>The order in which to sort the results of a list repositories operation.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SortBy" : {
+          "c2jName" : "sortBy",
+          "c2jShape" : "SortByEnum",
+          "deprecated" : false,
+          "documentation" : "<p>The criteria used to sort the results of a list repositories operation.</p>",
+          "enumType" : "SortByEnum",
+          "fluentSetterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@param sortBy The criteria used to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see SortByEnum*/",
+          "fluentSetterMethodName" : "withSortBy",
+          "getterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@return The criteria used to sort the results of a list repositories operation.\n@see SortByEnum*/",
+          "getterMethodName" : "getSortBy",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sortBy",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sortBy",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SortBy",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@param sortBy The criteria used to sort the results of a list repositories operation.\n@see SortByEnum*/",
+          "setterMethodName" : "setSortBy",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sortBy",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : true,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@param sortBy The criteria used to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see SortByEnum*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sortBy",
+            "variableType" : "String",
+            "documentation" : "<p>The criteria used to sort the results of a list repositories operation.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListRepositoriesRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListRepositoriesRequest",
+        "variableName" : "listRepositoriesRequest",
+        "variableType" : "ListRepositoriesRequest",
+        "documentation" : null,
+        "simpleType" : "ListRepositoriesRequest",
+        "variableSetterType" : "ListRepositoriesRequest"
+      },
+      "wrapper" : false
+    },
+    "ListRepositoriesResult" : {
+      "c2jName" : "ListRepositoriesOutput",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Represents the output of a list repositories operation.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "repositories",
+        "c2jShape" : "RepositoryNameIdPairList",
+        "deprecated" : false,
+        "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRepositories",
+        "getterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@return Lists the repositories called by the list repositories operation.*/",
+        "getterMethodName" : "getRepositories",
+        "getterModel" : {
+          "returnType" : "java.util.List<RepositoryNameIdPair>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "repositories",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "repositories",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "RepositoryNameIdPair",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "RepositoryNameIdPair",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "RepositoryNameIdPair",
+              "variableName" : "member",
+              "variableType" : "RepositoryNameIdPair",
+              "documentation" : "",
+              "simpleType" : "RepositoryNameIdPair",
+              "variableSetterType" : "RepositoryNameIdPair"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "RepositoryNameIdPair",
+              "variableName" : "member",
+              "variableType" : "RepositoryNameIdPair",
+              "documentation" : "",
+              "simpleType" : "RepositoryNameIdPair",
+              "variableSetterType" : "RepositoryNameIdPair"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "RepositoryNameIdPair",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "RepositoryNameIdPair",
+          "templateImplType" : "java.util.ArrayList<RepositoryNameIdPair>",
+          "templateType" : "java.util.List<RepositoryNameIdPair>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Repositories",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.*/",
+        "setterMethodName" : "setRepositories",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
+          "variableName" : "repositories",
+          "variableType" : "java.util.List<RepositoryNameIdPair>",
+          "documentation" : "",
+          "simpleType" : "List<RepositoryNameIdPair>",
+          "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRepositories(java.util.Collection)} or {@link #withRepositories(java.util.Collection)} if you want to override the existing values.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
+          "variableName" : "repositories",
+          "variableType" : "java.util.List<RepositoryNameIdPair>",
+          "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
+          "simpleType" : "List<RepositoryNameIdPair>",
+          "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@return An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@return An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Repositories" : {
+          "c2jName" : "repositories",
+          "c2jShape" : "RepositoryNameIdPairList",
+          "deprecated" : false,
+          "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRepositories",
+          "getterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@return Lists the repositories called by the list repositories operation.*/",
+          "getterMethodName" : "getRepositories",
+          "getterModel" : {
+            "returnType" : "java.util.List<RepositoryNameIdPair>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "repositories",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "repositories",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "RepositoryNameIdPair",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "RepositoryNameIdPair",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "RepositoryNameIdPair",
+                "variableName" : "member",
+                "variableType" : "RepositoryNameIdPair",
+                "documentation" : "",
+                "simpleType" : "RepositoryNameIdPair",
+                "variableSetterType" : "RepositoryNameIdPair"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "RepositoryNameIdPair",
+                "variableName" : "member",
+                "variableType" : "RepositoryNameIdPair",
+                "documentation" : "",
+                "simpleType" : "RepositoryNameIdPair",
+                "variableSetterType" : "RepositoryNameIdPair"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "RepositoryNameIdPair",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "RepositoryNameIdPair",
+            "templateImplType" : "java.util.ArrayList<RepositoryNameIdPair>",
+            "templateType" : "java.util.List<RepositoryNameIdPair>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Repositories",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.*/",
+          "setterMethodName" : "setRepositories",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
+            "variableName" : "repositories",
+            "variableType" : "java.util.List<RepositoryNameIdPair>",
+            "documentation" : "",
+            "simpleType" : "List<RepositoryNameIdPair>",
+            "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRepositories(java.util.Collection)} or {@link #withRepositories(java.util.Collection)} if you want to override the existing values.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
+            "variableName" : "repositories",
+            "variableType" : "java.util.List<RepositoryNameIdPair>",
+            "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
+            "simpleType" : "List<RepositoryNameIdPair>",
+            "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListRepositoriesResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListRepositoriesResult",
+        "variableName" : "listRepositoriesResult",
+        "variableType" : "ListRepositoriesResult",
+        "documentation" : null,
+        "simpleType" : "ListRepositoriesResult",
+        "variableSetterType" : "ListRepositoriesResult"
+      },
+      "wrapper" : false
+    },
+    "ListTagsForResourceRequest" : {
+      "c2jName" : "ListTagsForResourceInput",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListTagsForResource",
+        "locationName" : null,
+        "requestUri" : "/",
+        "target" : "CodeCommit_20150413.ListTagsForResource",
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "ResourceArn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@return The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@param nextToken An enumeration token that when provided in a request, returns the next batch of the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@return An enumeration token that when provided in a request, returns the next batch of the results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@param nextToken An enumeration token that when provided in a request, returns the next batch of the results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@param nextToken An enumeration token that when provided in a request, returns the next batch of the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@param nextToken An enumeration token that when provided in a request, returns the next batch of the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@return An enumeration token that when provided in a request, returns the next batch of the results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@param nextToken An enumeration token that when provided in a request, returns the next batch of the results.*/",
           "setterMethodName" : "setNextToken",
           "setterModel" : {
             "timestampFormat" : null,
@@ -38204,99 +39715,31 @@
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
-          "shouldEmitLegacyEnumSetter" : true,
+          "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>\n@param nextToken An enumeration token that when provided in a request, returns the next batch of the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "nextToken",
             "variableType" : "String",
-            "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "Order" : {
-          "c2jName" : "order",
-          "c2jShape" : "OrderEnum",
-          "deprecated" : false,
-          "documentation" : "<p>The order in which to sort the results of a list repositories operation.</p>",
-          "enumType" : "OrderEnum",
-          "fluentSetterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@param order The order in which to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see OrderEnum*/",
-          "fluentSetterMethodName" : "withOrder",
-          "getterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@return The order in which to sort the results of a list repositories operation.\n@see OrderEnum*/",
-          "getterMethodName" : "getOrder",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "order",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "order",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Order",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@param order The order in which to sort the results of a list repositories operation.\n@see OrderEnum*/",
-          "setterMethodName" : "setOrder",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "order",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : true,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The order in which to sort the results of a list repositories operation.</p>\n@param order The order in which to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see OrderEnum*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "order",
-            "variableType" : "String",
-            "documentation" : "<p>The order in which to sort the results of a list repositories operation.</p>",
+            "documentation" : "<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "SortBy" : {
-          "c2jName" : "sortBy",
-          "c2jShape" : "SortByEnum",
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "ResourceArn",
           "deprecated" : false,
-          "documentation" : "<p>The criteria used to sort the results of a list repositories operation.</p>",
-          "enumType" : "SortByEnum",
-          "fluentSetterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@param sortBy The criteria used to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see SortByEnum*/",
-          "fluentSetterMethodName" : "withSortBy",
-          "getterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@return The criteria used to sort the results of a list repositories operation.\n@see SortByEnum*/",
-          "getterMethodName" : "getSortBy",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@return The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.*/",
+          "getterMethodName" : "getResourceArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -38311,11 +39754,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "sortBy",
+            "marshallLocationName" : "resourceArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "sortBy",
+            "unmarshallLocationName" : "resourceArn",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -38327,29 +39770,29 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "SortBy",
+          "name" : "ResourceArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@param sortBy The criteria used to sort the results of a list repositories operation.\n@see SortByEnum*/",
-          "setterMethodName" : "setSortBy",
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.*/",
+          "setterMethodName" : "setResourceArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "sortBy",
+            "variableName" : "resourceArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
-          "shouldEmitLegacyEnumSetter" : true,
+          "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The criteria used to sort the results of a list repositories operation.</p>\n@param sortBy The criteria used to sort the results of a list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.\n@see SortByEnum*/",
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "sortBy",
+            "variableName" : "resourceArn",
             "variableType" : "String",
-            "documentation" : "<p>The criteria used to sort the results of a list repositories operation.</p>",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -38358,24 +39801,24 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ListRepositoriesRequest",
+      "required" : [ "resourceArn" ],
+      "shapeName" : "ListTagsForResourceRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListRepositoriesRequest",
-        "variableName" : "listRepositoriesRequest",
-        "variableType" : "ListRepositoriesRequest",
+        "variableDeclarationType" : "ListTagsForResourceRequest",
+        "variableName" : "listTagsForResourceRequest",
+        "variableType" : "ListTagsForResourceRequest",
         "documentation" : null,
-        "simpleType" : "ListRepositoriesRequest",
-        "variableSetterType" : "ListRepositoriesRequest"
+        "simpleType" : "ListTagsForResourceRequest",
+        "variableSetterType" : "ListTagsForResourceRequest"
       },
       "wrapper" : false
     },
-    "ListRepositoriesResult" : {
-      "c2jName" : "ListRepositoriesOutput",
+    "ListTagsForResourceResult" : {
+      "c2jName" : "ListTagsForResourceOutput",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -38383,7 +39826,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Represents the output of a list repositories operation.</p>",
+      "documentation" : "",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -38393,17 +39836,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "repositories",
-        "c2jShape" : "RepositoryNameIdPairList",
+        "c2jName" : "tags",
+        "c2jShape" : "TagsMap",
         "deprecated" : false,
-        "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
+        "documentation" : "<p>A list of tag key and value pairs associated with the specified resource.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withRepositories",
-        "getterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@return Lists the repositories called by the list repositories operation.*/",
-        "getterMethodName" : "getRepositories",
+        "fluentSetterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@param tags A list of tag key and value pairs associated with the specified resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@return A list of tag key and value pairs associated with the specified resource.*/",
+        "getterMethodName" : "getTags",
         "getterModel" : {
-          "returnType" : "java.util.List<RepositoryNameIdPair>",
+          "returnType" : "java.util.Map<String,String>",
           "documentation" : null
         },
         "http" : {
@@ -38416,32 +39859,38 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "repositories",
+          "marshallLocationName" : "tags",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "repositories",
+          "unmarshallLocationName" : "tags",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "RepositoryNameIdPair",
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "TagValue",
             "deprecated" : false,
             "documentation" : "",
             "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
             "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
+            "getterMethodName" : "getValue",
             "getterModel" : {
-              "returnType" : "RepositoryNameIdPair",
+              "returnType" : "String",
               "documentation" : null
             },
             "http" : {
@@ -38454,11 +39903,11 @@
               "isStreaming" : false,
               "location" : null,
               "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
+              "marshallLocationName" : "value",
               "queryString" : false,
               "requiresLength" : false,
               "statusCode" : false,
-              "unmarshallLocationName" : "member",
+              "unmarshallLocationName" : "value",
               "uri" : false
             },
             "idempotencyToken" : false,
@@ -38468,88 +39917,82 @@
             "listModel" : null,
             "map" : false,
             "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Value",
             "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
             "setterModel" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "RepositoryNameIdPair",
-              "variableName" : "member",
-              "variableType" : "RepositoryNameIdPair",
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
               "documentation" : "",
-              "simpleType" : "RepositoryNameIdPair",
-              "variableSetterType" : "RepositoryNameIdPair"
+              "simpleType" : "String",
+              "variableSetterType" : "String"
             },
             "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
+            "simple" : true,
             "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "RepositoryNameIdPair",
-              "variableName" : "member",
-              "variableType" : "RepositoryNameIdPair",
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
               "documentation" : "",
-              "simpleType" : "RepositoryNameIdPair",
-              "variableSetterType" : "RepositoryNameIdPair"
+              "simpleType" : "String",
+              "variableSetterType" : "String"
             },
             "xmlNameSpaceUri" : null
           },
-          "memberLocationName" : null,
-          "memberType" : "RepositoryNameIdPair",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "RepositoryNameIdPair",
-          "templateImplType" : "java.util.ArrayList<RepositoryNameIdPair>",
-          "templateType" : "java.util.List<RepositoryNameIdPair>"
-        },
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "Repositories",
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
+        },
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.*/",
-        "setterMethodName" : "setRepositories",
+        "setterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@param tags A list of tag key and value pairs associated with the specified resource.*/",
+        "setterMethodName" : "setTags",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
-          "variableName" : "repositories",
-          "variableType" : "java.util.List<RepositoryNameIdPair>",
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
           "documentation" : "",
-          "simpleType" : "List<RepositoryNameIdPair>",
-          "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRepositories(java.util.Collection)} or {@link #withRepositories(java.util.Collection)} if you want to override the existing values.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@param tags A list of tag key and value pairs associated with the specified resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
-          "variableName" : "repositories",
-          "variableType" : "java.util.List<RepositoryNameIdPair>",
-          "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
-          "simpleType" : "List<RepositoryNameIdPair>",
-          "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "<p>A list of tag key and value pairs associated with the specified resource.</p>",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "nextToken",
         "c2jShape" : "NextToken",
         "deprecated" : false,
-        "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+        "documentation" : "<p>An enumeration token that allows the operation to batch the next results of the operation.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@param nextToken An enumeration token that allows the operation to batch the next results of the operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@return An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+        "getterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@return An enumeration token that allows the operation to batch the next results of the operation.*/",
         "getterMethodName" : "getNextToken",
         "getterModel" : {
           "returnType" : "String",
@@ -38583,7 +40026,7 @@
         "marshallingType" : "STRING",
         "name" : "NextToken",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+        "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@param nextToken An enumeration token that allows the operation to batch the next results of the operation.*/",
         "setterMethodName" : "setNextToken",
         "setterModel" : {
           "timestampFormat" : null,
@@ -38597,13 +40040,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@param nextToken An enumeration token that allows the operation to batch the next results of the operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "nextToken",
           "variableType" : "String",
-          "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+          "documentation" : "<p>An enumeration token that allows the operation to batch the next results of the operation.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -38614,11 +40057,11 @@
           "c2jName" : "nextToken",
           "c2jShape" : "NextToken",
           "deprecated" : false,
-          "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+          "documentation" : "<p>An enumeration token that allows the operation to batch the next results of the operation.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@param nextToken An enumeration token that allows the operation to batch the next results of the operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@return An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+          "getterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@return An enumeration token that allows the operation to batch the next results of the operation.*/",
           "getterMethodName" : "getNextToken",
           "getterModel" : {
             "returnType" : "String",
@@ -38652,7 +40095,7 @@
           "marshallingType" : "STRING",
           "name" : "NextToken",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.*/",
+          "setterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@param nextToken An enumeration token that allows the operation to batch the next results of the operation.*/",
           "setterMethodName" : "setNextToken",
           "setterModel" : {
             "timestampFormat" : null,
@@ -38666,30 +40109,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>\n@param nextToken An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>An enumeration token that allows the operation to batch the next results of the operation.</p>\n@param nextToken An enumeration token that allows the operation to batch the next results of the operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "nextToken",
             "variableType" : "String",
-            "documentation" : "<p>An enumeration token that allows the operation to batch the results of the operation. Batch sizes are 1,000 for list repository operations. When the client sends the token back to AWS CodeCommit, another page of 1,000 records is retrieved.</p>",
+            "documentation" : "<p>An enumeration token that allows the operation to batch the next results of the operation.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Repositories" : {
-          "c2jName" : "repositories",
-          "c2jShape" : "RepositoryNameIdPairList",
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "TagsMap",
           "deprecated" : false,
-          "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
+          "documentation" : "<p>A list of tag key and value pairs associated with the specified resource.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withRepositories",
-          "getterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@return Lists the repositories called by the list repositories operation.*/",
-          "getterMethodName" : "getRepositories",
+          "fluentSetterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@param tags A list of tag key and value pairs associated with the specified resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@return A list of tag key and value pairs associated with the specified resource.*/",
+          "getterMethodName" : "getTags",
           "getterModel" : {
-            "returnType" : "java.util.List<RepositoryNameIdPair>",
+            "returnType" : "java.util.Map<String,String>",
             "documentation" : null
           },
           "http" : {
@@ -38702,32 +40145,38 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "repositories",
+            "marshallLocationName" : "tags",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "repositories",
+            "unmarshallLocationName" : "tags",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "RepositoryNameIdPair",
+          "list" : false,
+          "listModel" : null,
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "TagValue",
               "deprecated" : false,
               "documentation" : "",
               "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
               "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
+              "getterMethodName" : "getValue",
               "getterModel" : {
-                "returnType" : "RepositoryNameIdPair",
+                "returnType" : "String",
                 "documentation" : null
               },
               "http" : {
@@ -38740,11 +40189,11 @@
                 "isStreaming" : false,
                 "location" : null,
                 "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
+                "marshallLocationName" : "value",
                 "queryString" : false,
                 "requiresLength" : false,
                 "statusCode" : false,
-                "unmarshallLocationName" : "member",
+                "unmarshallLocationName" : "value",
                 "uri" : false
               },
               "idempotencyToken" : false,
@@ -38754,77 +40203,71 @@
               "listModel" : null,
               "map" : false,
               "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
               "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
               "setterModel" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "RepositoryNameIdPair",
-                "variableName" : "member",
-                "variableType" : "RepositoryNameIdPair",
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
                 "documentation" : "",
-                "simpleType" : "RepositoryNameIdPair",
-                "variableSetterType" : "RepositoryNameIdPair"
+                "simpleType" : "String",
+                "variableSetterType" : "String"
               },
               "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
+              "simple" : true,
               "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
               "variable" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "RepositoryNameIdPair",
-                "variableName" : "member",
-                "variableType" : "RepositoryNameIdPair",
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
                 "documentation" : "",
-                "simpleType" : "RepositoryNameIdPair",
-                "variableSetterType" : "RepositoryNameIdPair"
+                "simpleType" : "String",
+                "variableSetterType" : "String"
               },
               "xmlNameSpaceUri" : null
             },
-            "memberLocationName" : null,
-            "memberType" : "RepositoryNameIdPair",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "RepositoryNameIdPair",
-            "templateImplType" : "java.util.ArrayList<RepositoryNameIdPair>",
-            "templateType" : "java.util.List<RepositoryNameIdPair>"
-          },
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "Repositories",
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
+          },
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n@param repositories Lists the repositories called by the list repositories operation.*/",
-          "setterMethodName" : "setRepositories",
+          "setterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@param tags A list of tag key and value pairs associated with the specified resource.*/",
+          "setterMethodName" : "setTags",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
-            "variableName" : "repositories",
-            "variableType" : "java.util.List<RepositoryNameIdPair>",
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
             "documentation" : "",
-            "simpleType" : "List<RepositoryNameIdPair>",
-            "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Lists the repositories called by the list repositories operation.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRepositories(java.util.Collection)} or {@link #withRepositories(java.util.Collection)} if you want to override the existing values.</p>\n@param repositories Lists the repositories called by the list repositories operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A list of tag key and value pairs associated with the specified resource.</p>\n@param tags A list of tag key and value pairs associated with the specified resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<RepositoryNameIdPair>",
-            "variableName" : "repositories",
-            "variableType" : "java.util.List<RepositoryNameIdPair>",
-            "documentation" : "<p>Lists the repositories called by the list repositories operation.</p>",
-            "simpleType" : "List<RepositoryNameIdPair>",
-            "variableSetterType" : "java.util.Collection<RepositoryNameIdPair>"
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "<p>A list of tag key and value pairs associated with the specified resource.</p>",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -38832,7 +40275,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListRepositoriesResult",
+      "shapeName" : "ListTagsForResourceResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -38841,12 +40284,12 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListRepositoriesResult",
-        "variableName" : "listRepositoriesResult",
-        "variableType" : "ListRepositoriesResult",
+        "variableDeclarationType" : "ListTagsForResourceResult",
+        "variableName" : "listTagsForResourceResult",
+        "variableType" : "ListTagsForResourceResult",
         "documentation" : null,
-        "simpleType" : "ListRepositoriesResult",
-        "variableSetterType" : "ListRepositoriesResult"
+        "simpleType" : "ListTagsForResourceResult",
+        "variableSetterType" : "ListTagsForResourceResult"
       },
       "wrapper" : false
     },
@@ -57730,6 +59173,44 @@
       },
       "wrapper" : false
     },
+    "ResourceArnRequiredException" : {
+      "c2jName" : "ResourceArnRequiredException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "enums" : null,
+      "errorCode" : "ResourceArnRequiredException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ResourceArnRequiredException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ResourceArnRequiredException",
+        "variableName" : "resourceArnRequiredException",
+        "variableType" : "ResourceArnRequiredException",
+        "documentation" : null,
+        "simpleType" : "ResourceArnRequiredException",
+        "variableSetterType" : "ResourceArnRequiredException"
+      },
+      "wrapper" : false
+    },
     "RestrictedSourceFileException" : {
       "c2jName" : "RestrictedSourceFileException",
       "customization" : {
@@ -59620,6 +61101,641 @@
       },
       "wrapper" : false
     },
+    "TagKeysListRequiredException" : {
+      "c2jName" : "TagKeysListRequiredException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A list of tag keys is required. The list cannot be empty or null.</p>",
+      "enums" : null,
+      "errorCode" : "TagKeysListRequiredException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TagKeysListRequiredException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagKeysListRequiredException",
+        "variableName" : "tagKeysListRequiredException",
+        "variableType" : "TagKeysListRequiredException",
+        "documentation" : null,
+        "simpleType" : "TagKeysListRequiredException",
+        "variableSetterType" : "TagKeysListRequiredException"
+      },
+      "wrapper" : false
+    },
+    "TagPolicyException" : {
+      "c2jName" : "TagPolicyException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The tag policy is not valid.</p>",
+      "enums" : null,
+      "errorCode" : "TagPolicyException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TagPolicyException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagPolicyException",
+        "variableName" : "tagPolicyException",
+        "variableType" : "TagPolicyException",
+        "documentation" : null,
+        "simpleType" : "TagPolicyException",
+        "variableSetterType" : "TagPolicyException"
+      },
+      "wrapper" : false
+    },
+    "TagResourceRequest" : {
+      "c2jName" : "TagResourceInput",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "TagResource",
+        "locationName" : null,
+        "requestUri" : "/",
+        "target" : "CodeCommit_20150413.TagResource",
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "ResourceArn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@return The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tags",
+        "c2jShape" : "TagsMap",
+        "deprecated" : false,
+        "documentation" : "<p>The key-value pair to use when tagging this repository.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@param tags The key-value pair to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@return The key-value pair to use when tagging this repository.*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.Map<String,String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "TagValue",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getValue",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "value",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "value",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Value",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
+        },
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@param tags The key-value pair to use when tagging this repository.*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@param tags The key-value pair to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "<p>The key-value pair to use when tagging this repository.</p>",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "ResourceArn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@return The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "TagsMap",
+          "deprecated" : false,
+          "documentation" : "<p>The key-value pair to use when tagging this repository.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@param tags The key-value pair to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@return The key-value pair to use when tagging this repository.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.Map<String,String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "TagValue",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getValue",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "value",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "value",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
+          },
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@param tags The key-value pair to use when tagging this repository.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The key-value pair to use when tagging this repository.</p>\n@param tags The key-value pair to use when tagging this repository.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "<p>The key-value pair to use when tagging this repository.</p>",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "tags" ],
+      "shapeName" : "TagResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceRequest",
+        "variableName" : "tagResourceRequest",
+        "variableType" : "TagResourceRequest",
+        "documentation" : null,
+        "simpleType" : "TagResourceRequest",
+        "variableSetterType" : "TagResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "TagResourceResult" : {
+      "c2jName" : "TagResourceResult",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : null,
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TagResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceResult",
+        "variableName" : "tagResourceResult",
+        "variableType" : "TagResourceResult",
+        "documentation" : null,
+        "simpleType" : "TagResourceResult",
+        "variableSetterType" : "TagResourceResult"
+      },
+      "wrapper" : false
+    },
+    "TagsMapRequiredException" : {
+      "c2jName" : "TagsMapRequiredException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A map of tags is required.</p>",
+      "enums" : null,
+      "errorCode" : "TagsMapRequiredException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TagsMapRequiredException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagsMapRequiredException",
+        "variableName" : "tagsMapRequiredException",
+        "variableType" : "TagsMapRequiredException",
+        "documentation" : null,
+        "simpleType" : "TagsMapRequiredException",
+        "variableSetterType" : "TagsMapRequiredException"
+      },
+      "wrapper" : false
+    },
     "Target" : {
       "c2jName" : "Target",
       "customization" : {
@@ -61377,6 +63493,565 @@
       },
       "wrapper" : false
     },
+    "TooManyTagsException" : {
+      "c2jName" : "TooManyTagsException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The maximum number of tags for an AWS CodeCommit resource has been exceeded.</p>",
+      "enums" : null,
+      "errorCode" : "TooManyTagsException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TooManyTagsException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TooManyTagsException",
+        "variableName" : "tooManyTagsException",
+        "variableType" : "TooManyTagsException",
+        "documentation" : null,
+        "simpleType" : "TooManyTagsException",
+        "variableSetterType" : "TooManyTagsException"
+      },
+      "wrapper" : false
+    },
+    "UntagResourceRequest" : {
+      "c2jName" : "UntagResourceInput",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "UntagResource",
+        "locationName" : null,
+        "requestUri" : "/",
+        "target" : "CodeCommit_20150413.UntagResource",
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "ResourceArn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to remove tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@return The Amazon Resource Name (ARN) of the resource to which you want to remove tags.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to remove tags.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to remove tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tagKeys",
+        "c2jShape" : "TagKeysList",
+        "deprecated" : false,
+        "documentation" : "<p>The tag key for each tag that you want to remove from the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n@param tagKeys The tag key for each tag that you want to remove from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTagKeys",
+        "getterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n@return The tag key for each tag that you want to remove from the resource.*/",
+        "getterMethodName" : "getTagKeys",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tagKeys",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tagKeys",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "TagKey",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "TagKeys",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n@param tagKeys The tag key for each tag that you want to remove from the resource.*/",
+        "setterMethodName" : "setTagKeys",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "tagKeys",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys The tag key for each tag that you want to remove from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "tagKeys",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "<p>The tag key for each tag that you want to remove from the resource.</p>",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "ResourceArn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to remove tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@return The Amazon Resource Name (ARN) of the resource to which you want to remove tags.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to remove tags.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the resource to which you want to remove tags.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TagKeys" : {
+          "c2jName" : "tagKeys",
+          "c2jShape" : "TagKeysList",
+          "deprecated" : false,
+          "documentation" : "<p>The tag key for each tag that you want to remove from the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n@param tagKeys The tag key for each tag that you want to remove from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTagKeys",
+          "getterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n@return The tag key for each tag that you want to remove from the resource.*/",
+          "getterMethodName" : "getTagKeys",
+          "getterModel" : {
+            "returnType" : "java.util.List<String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tagKeys",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tagKeys",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "TagKey",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "TagKeys",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n@param tagKeys The tag key for each tag that you want to remove from the resource.*/",
+          "setterMethodName" : "setTagKeys",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "tagKeys",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The tag key for each tag that you want to remove from the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys The tag key for each tag that you want to remove from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "tagKeys",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "<p>The tag key for each tag that you want to remove from the resource.</p>",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "tagKeys" ],
+      "shapeName" : "UntagResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceRequest",
+        "variableName" : "untagResourceRequest",
+        "variableType" : "UntagResourceRequest",
+        "documentation" : null,
+        "simpleType" : "UntagResourceRequest",
+        "variableSetterType" : "UntagResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "UntagResourceResult" : {
+      "c2jName" : "UntagResourceResult",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : null,
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "UntagResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceResult",
+        "variableName" : "untagResourceResult",
+        "variableType" : "UntagResourceResult",
+        "documentation" : null,
+        "simpleType" : "UntagResourceResult",
+        "variableSetterType" : "UntagResourceResult"
+      },
+      "wrapper" : false
+    },
     "UpdateCommentRequest" : {
       "c2jName" : "UpdateCommentInput",
       "customization" : {
diff --git a/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-model.json b/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-model.json
index b6d032f52839..c5ed6deb71d5 100644
--- a/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/codecommit-2015-04-13-model.json
@@ -163,7 +163,11 @@
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
         {"shape":"EncryptionKeyNotFoundException"},
-        {"shape":"EncryptionKeyUnavailableException"}
+        {"shape":"EncryptionKeyUnavailableException"},
+        {"shape":"InvalidTagsMapException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"InvalidSystemTagUsageException"},
+        {"shape":"TagPolicyException"}
       ],
       "documentation":"<p>Creates a new, empty repository.</p>"
     },
@@ -652,6 +656,22 @@
       ],
       "documentation":"<p>Gets information about one or more repositories.</p>"
     },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceInput"},
+      "output":{"shape":"ListTagsForResourceOutput"},
+      "errors":[
+        {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"InvalidRepositoryNameException"},
+        {"shape":"ResourceArnRequiredException"},
+        {"shape":"InvalidResourceArnException"}
+      ],
+      "documentation":"<p>Gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>"
+    },
     "MergePullRequestByFastForward":{
       "name":"MergePullRequestByFastForward",
       "http":{
@@ -853,6 +873,26 @@
       ],
       "documentation":"<p>Replaces all triggers for a repository. This can be used to create or delete triggers.</p>"
     },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceInput"},
+      "errors":[
+        {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"InvalidRepositoryNameException"},
+        {"shape":"ResourceArnRequiredException"},
+        {"shape":"InvalidResourceArnException"},
+        {"shape":"TagsMapRequiredException"},
+        {"shape":"InvalidTagsMapException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"InvalidSystemTagUsageException"},
+        {"shape":"TagPolicyException"}
+      ],
+      "documentation":"<p>Adds or updates tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>"
+    },
     "TestRepositoryTriggers":{
       "name":"TestRepositoryTriggers",
       "http":{
@@ -886,6 +926,26 @@
       ],
       "documentation":"<p>Tests the functionality of repository triggers by sending information to the trigger target. If real data is available in the repository, the test will send data from the last commit. If no data is available, sample data will be generated.</p>"
     },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceInput"},
+      "errors":[
+        {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"InvalidRepositoryNameException"},
+        {"shape":"ResourceArnRequiredException"},
+        {"shape":"InvalidResourceArnException"},
+        {"shape":"TagKeysListRequiredException"},
+        {"shape":"InvalidTagKeysListException"},
+        {"shape":"TooManyTagsException"},
+        {"shape":"InvalidSystemTagUsageException"},
+        {"shape":"TagPolicyException"}
+      ],
+      "documentation":"<p>Removes tags for a resource in AWS CodeCommit. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>"
+    },
     "UpdateComment":{
       "name":"UpdateComment",
       "http":{
@@ -1018,7 +1078,7 @@
         {"shape":"RepositoryNameRequiredException"},
         {"shape":"InvalidRepositoryNameException"}
       ],
-      "documentation":"<p>Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. The suffix \".git\" is prohibited. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide.</p>"
+      "documentation":"<p>Renames a repository. The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. The suffix \".git\" is prohibited. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide.</p>"
     }
   },
   "shapes":{
@@ -1548,11 +1608,15 @@
       "members":{
         "repositoryName":{
           "shape":"RepositoryName",
-          "documentation":"<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>"
+          "documentation":"<p>The name of the new repository to be created.</p> <note> <p>The repository name must be unique across the calling AWS account. In addition, repository names are limited to 100 alphanumeric, dash, and underscore characters, and cannot include certain characters. For a full description of the limits on repository names, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">Limits</a> in the AWS CodeCommit User Guide. The suffix \".git\" is prohibited.</p> </note>"
         },
         "repositoryDescription":{
           "shape":"RepositoryDescription",
           "documentation":"<p>A comment or description about the new repository.</p> <note> <p>The description field for a repository accepts all HTML characters and all valid Unicode characters. Applications that do not HTML-encode the description and display it in a web page could expose users to potentially malicious code. Make sure that you HTML-encode the description field in any application that uses this API to display the repository description on a web page.</p> </note>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>One or more tag key-value pairs to use when tagging this repository.</p>"
         }
       },
       "documentation":"<p>Represents the input of a create repository operation.</p>"
@@ -1956,7 +2020,7 @@
       "type":"structure",
       "members":{
       },
-      "documentation":"<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
+      "documentation":"<p>The specified file exceeds the file size limit for AWS CodeCommit. For more information about limits in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/limits.html\">AWS CodeCommit User Guide</a>.</p>",
       "exception":true
     },
     "FilesMetadata":{
@@ -2718,6 +2782,13 @@
       "documentation":"<p>The region for the trigger target does not match the region for the repository. Triggers must be created in the same region as the target for the trigger.</p>",
       "exception":true
     },
+    "InvalidResourceArnException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The value for the resource ARN is not valid. For more information about resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "exception":true
+    },
     "InvalidSortByException":{
       "type":"structure",
       "members":{
@@ -2732,6 +2803,27 @@
       "documentation":"<p>The source commit specifier is not valid. You must provide a valid branch name, tag, or full commit ID.</p>",
       "exception":true
     },
+    "InvalidSystemTagUsageException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The specified tag is not valid. Key names cannot be prefixed with aws:.</p>",
+      "exception":true
+    },
+    "InvalidTagKeysListException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The list of tags is not valid.</p>",
+      "exception":true
+    },
+    "InvalidTagsMapException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The map of tags is not valid.</p>",
+      "exception":true
+    },
     "InvalidTargetException":{
       "type":"structure",
       "members":{
@@ -2864,6 +2956,33 @@
       },
       "documentation":"<p>Represents the output of a list repositories operation.</p>"
     },
+    "ListTagsForResourceInput":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource for which you want to get information about tags, if any.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that when provided in a request, returns the next batch of the results.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceOutput":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>A list of tag key and value pairs associated with the specified resource.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>An enumeration token that allows the operation to batch the next results of the operation.</p>"
+        }
+      }
+    },
     "Location":{
       "type":"structure",
       "members":{
@@ -3873,6 +3992,14 @@
       "documentation":"<p>The list of triggers for the repository is required but was not specified.</p>",
       "exception":true
     },
+    "ResourceArn":{"type":"string"},
+    "ResourceArnRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>A valid Amazon Resource Name (ARN) for an AWS CodeCommit resource is required. For a list of valid resources in AWS CodeCommit, see <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/auth-and-access-control-iam-access-control-identity-based.html#arn-formats\">CodeCommit Resources and Operations</a> in the AWS CodeCommit User Guide.</p>",
+      "exception":true
+    },
     "RestrictedSourceFileException":{
       "type":"structure",
       "members":{
@@ -4000,6 +4127,63 @@
       "type":"list",
       "member":{"shape":"SymbolicLink"}
     },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeysList":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagKeysListRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>A list of tag keys is required. The list cannot be empty or null.</p>",
+      "exception":true
+    },
+    "TagPolicyException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The tag policy is not valid.</p>",
+      "exception":true
+    },
+    "TagResourceInput":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to which you want to add or update tags.</p>"
+        },
+        "tags":{
+          "shape":"TagsMap",
+          "documentation":"<p>The key-value pair to use when tagging this repository.</p>"
+        }
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
+    "TagsMap":{
+      "type":"map",
+      "key":{"shape":"TagKey"},
+      "value":{"shape":"TagValue"}
+    },
+    "TagsMapRequiredException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>A map of tags is required.</p>",
+      "exception":true
+    },
     "Target":{
       "type":"structure",
       "required":[
@@ -4097,6 +4281,30 @@
       "documentation":"<p>A pull request title is required. It cannot be empty or null.</p>",
       "exception":true
     },
+    "TooManyTagsException":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>The maximum number of tags for an AWS CodeCommit resource has been exceeded.</p>",
+      "exception":true
+    },
+    "UntagResourceInput":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"ResourceArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the resource to which you want to remove tags.</p>"
+        },
+        "tagKeys":{
+          "shape":"TagKeysList",
+          "documentation":"<p>The tag key for each tag that you want to remove from the resource.</p>"
+        }
+      }
+    },
     "UpdateCommentInput":{
       "type":"structure",
       "required":[
@@ -4275,5 +4483,5 @@
     },
     "blob":{"type":"blob"}
   },
-  "documentation":"<fullname>AWS CodeCommit</fullname> <p>This is the <i>AWS CodeCommit API Reference</i>. This reference provides descriptions of the operations and data types for AWS CodeCommit API along with usage examples.</p> <p>You can use the AWS CodeCommit API to work with the following objects:</p> <p>Repositories, by calling the following:</p> <ul> <li> <p> <a>BatchGetRepositories</a>, which returns information about one or more repositories associated with your AWS account.</p> </li> <li> <p> <a>CreateRepository</a>, which creates an AWS CodeCommit repository.</p> </li> <li> <p> <a>DeleteRepository</a>, which deletes an AWS CodeCommit repository.</p> </li> <li> <p> <a>GetRepository</a>, which returns information about a specified repository.</p> </li> <li> <p> <a>ListRepositories</a>, which lists all AWS CodeCommit repositories associated with your AWS account.</p> </li> <li> <p> <a>UpdateRepositoryDescription</a>, which sets or updates the description of the repository.</p> </li> <li> <p> <a>UpdateRepositoryName</a>, which changes the name of the repository. If you change the name of a repository, no other users of that repository will be able to access it until you send them the new HTTPS or SSH URL to use.</p> </li> </ul> <p>Branches, by calling the following:</p> <ul> <li> <p> <a>CreateBranch</a>, which creates a new branch in a specified repository.</p> </li> <li> <p> <a>DeleteBranch</a>, which deletes the specified branch in a repository unless it is the default branch.</p> </li> <li> <p> <a>GetBranch</a>, which returns information about a specified branch.</p> </li> <li> <p> <a>ListBranches</a>, which lists all branches for a specified repository.</p> </li> <li> <p> <a>UpdateDefaultBranch</a>, which changes the default branch for a repository.</p> </li> </ul> <p>Files, by calling the following:</p> <ul> <li> <p> <a>DeleteFile</a>, which deletes the content of a specified file from a specified branch.</p> </li> <li> <p> <a>GetFile</a>, which returns the base-64 encoded content of a specified file.</p> </li> <li> <p> <a>GetFolder</a>, which returns the contents of a specified folder or directory.</p> </li> <li> <p> <a>PutFile</a>, which adds or modifies a file in a specified repository and branch.</p> </li> </ul> <p>Information about committed code in a repository, by calling the following:</p> <ul> <li> <p> <a>CreateCommit</a>, which creates a commit for changes to a repository.</p> </li> <li> <p> <a>GetBlob</a>, which returns the base-64 encoded content of an individual Git blob object within a repository.</p> </li> <li> <p> <a>GetCommit</a>, which returns information about a commit, including commit messages and author and committer information.</p> </li> <li> <p> <a>GetDifferences</a>, which returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID or other fully qualified reference).</p> </li> </ul> <p>Pull requests, by calling the following:</p> <ul> <li> <p> <a>CreatePullRequest</a>, which creates a pull request in a specified repository.</p> </li> <li> <p> <a>DescribePullRequestEvents</a>, which returns information about one or more pull request events.</p> </li> <li> <p> <a>GetCommentsForPullRequest</a>, which returns information about comments on a specified pull request.</p> </li> <li> <p> <a>GetMergeConflicts</a>, which returns information about merge conflicts between the source and destination branch in a pull request.</p> </li> <li> <p> <a>GetPullRequest</a>, which returns information about a specified pull request.</p> </li> <li> <p> <a>ListPullRequests</a>, which lists all pull requests for a repository.</p> </li> <li> <p> <a>MergePullRequestByFastForward</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the fast-forward merge option.</p> </li> <li> <p> <a>PostCommentForPullRequest</a>, which posts a comment to a pull request at the specified line, file, or request.</p> </li> <li> <p> <a>UpdatePullRequestDescription</a>, which updates the description of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestStatus</a>, which updates the status of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestTitle</a>, which updates the title of a pull request.</p> </li> </ul> <p>Information about comments in a repository, by calling the following:</p> <ul> <li> <p> <a>DeleteCommentContent</a>, which deletes the content of a comment on a commit in a repository.</p> </li> <li> <p> <a>GetComment</a>, which returns information about a comment on a commit.</p> </li> <li> <p> <a>GetCommentsForComparedCommit</a>, which returns information about comments on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentForComparedCommit</a>, which creates a comment on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentReply</a>, which creates a reply to a comment.</p> </li> <li> <p> <a>UpdateComment</a>, which updates the content of a comment on a commit in a repository.</p> </li> </ul> <p>Triggers, by calling the following:</p> <ul> <li> <p> <a>GetRepositoryTriggers</a>, which returns information about triggers configured for a repository.</p> </li> <li> <p> <a>PutRepositoryTriggers</a>, which replaces all triggers for a repository and can be used to create or delete triggers.</p> </li> <li> <p> <a>TestRepositoryTriggers</a>, which tests the functionality of a repository trigger by sending data to the trigger target.</p> </li> </ul> <p>For information about how to use AWS CodeCommit, see the <a href=\"http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit User Guide</a>.</p>"
+  "documentation":"<fullname>AWS CodeCommit</fullname> <p>This is the <i>AWS CodeCommit API Reference</i>. This reference provides descriptions of the operations and data types for AWS CodeCommit API along with usage examples.</p> <p>You can use the AWS CodeCommit API to work with the following objects:</p> <p>Repositories, by calling the following:</p> <ul> <li> <p> <a>BatchGetRepositories</a>, which returns information about one or more repositories associated with your AWS account.</p> </li> <li> <p> <a>CreateRepository</a>, which creates an AWS CodeCommit repository.</p> </li> <li> <p> <a>DeleteRepository</a>, which deletes an AWS CodeCommit repository.</p> </li> <li> <p> <a>GetRepository</a>, which returns information about a specified repository.</p> </li> <li> <p> <a>ListRepositories</a>, which lists all AWS CodeCommit repositories associated with your AWS account.</p> </li> <li> <p> <a>UpdateRepositoryDescription</a>, which sets or updates the description of the repository.</p> </li> <li> <p> <a>UpdateRepositoryName</a>, which changes the name of the repository. If you change the name of a repository, no other users of that repository will be able to access it until you send them the new HTTPS or SSH URL to use.</p> </li> </ul> <p>Branches, by calling the following:</p> <ul> <li> <p> <a>CreateBranch</a>, which creates a new branch in a specified repository.</p> </li> <li> <p> <a>DeleteBranch</a>, which deletes the specified branch in a repository unless it is the default branch.</p> </li> <li> <p> <a>GetBranch</a>, which returns information about a specified branch.</p> </li> <li> <p> <a>ListBranches</a>, which lists all branches for a specified repository.</p> </li> <li> <p> <a>UpdateDefaultBranch</a>, which changes the default branch for a repository.</p> </li> </ul> <p>Files, by calling the following:</p> <ul> <li> <p> <a>DeleteFile</a>, which deletes the content of a specified file from a specified branch.</p> </li> <li> <p> <a>GetFile</a>, which returns the base-64 encoded content of a specified file.</p> </li> <li> <p> <a>GetFolder</a>, which returns the contents of a specified folder or directory.</p> </li> <li> <p> <a>PutFile</a>, which adds or modifies a file in a specified repository and branch.</p> </li> </ul> <p>Information about committed code in a repository, by calling the following:</p> <ul> <li> <p> <a>CreateCommit</a>, which creates a commit for changes to a repository.</p> </li> <li> <p> <a>GetBlob</a>, which returns the base-64 encoded content of an individual Git blob object within a repository.</p> </li> <li> <p> <a>GetCommit</a>, which returns information about a commit, including commit messages and author and committer information.</p> </li> <li> <p> <a>GetDifferences</a>, which returns information about the differences in a valid commit specifier (such as a branch, tag, HEAD, commit ID or other fully qualified reference).</p> </li> </ul> <p>Pull requests, by calling the following:</p> <ul> <li> <p> <a>CreatePullRequest</a>, which creates a pull request in a specified repository.</p> </li> <li> <p> <a>DescribePullRequestEvents</a>, which returns information about one or more pull request events.</p> </li> <li> <p> <a>GetCommentsForPullRequest</a>, which returns information about comments on a specified pull request.</p> </li> <li> <p> <a>GetMergeConflicts</a>, which returns information about merge conflicts between the source and destination branch in a pull request.</p> </li> <li> <p> <a>GetPullRequest</a>, which returns information about a specified pull request.</p> </li> <li> <p> <a>ListPullRequests</a>, which lists all pull requests for a repository.</p> </li> <li> <p> <a>MergePullRequestByFastForward</a>, which merges the source destination branch of a pull request into the specified destination branch for that pull request using the fast-forward merge option.</p> </li> <li> <p> <a>PostCommentForPullRequest</a>, which posts a comment to a pull request at the specified line, file, or request.</p> </li> <li> <p> <a>UpdatePullRequestDescription</a>, which updates the description of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestStatus</a>, which updates the status of a pull request.</p> </li> <li> <p> <a>UpdatePullRequestTitle</a>, which updates the title of a pull request.</p> </li> </ul> <p>Information about comments in a repository, by calling the following:</p> <ul> <li> <p> <a>DeleteCommentContent</a>, which deletes the content of a comment on a commit in a repository.</p> </li> <li> <p> <a>GetComment</a>, which returns information about a comment on a commit.</p> </li> <li> <p> <a>GetCommentsForComparedCommit</a>, which returns information about comments on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentForComparedCommit</a>, which creates a comment on the comparison between two commit specifiers in a repository.</p> </li> <li> <p> <a>PostCommentReply</a>, which creates a reply to a comment.</p> </li> <li> <p> <a>UpdateComment</a>, which updates the content of a comment on a commit in a repository.</p> </li> </ul> <p>Tags used to tag resources in AWS CodeCommit (not Git tags), by calling the following:</p> <ul> <li> <p> <a>ListTagsForResource</a>, which gets information about AWS tags for a specified Amazon Resource Name (ARN) in AWS CodeCommit.</p> </li> <li> <p> <a>TagResource</a>, which adds or updates tags for a resource in AWS CodeCommit.</p> </li> <li> <p> <a>UntagResource</a>, which removes tags for a resource in AWS CodeCommit.</p> </li> </ul> <p>Triggers, by calling the following:</p> <ul> <li> <p> <a>GetRepositoryTriggers</a>, which returns information about triggers configured for a repository.</p> </li> <li> <p> <a>PutRepositoryTriggers</a>, which replaces all triggers for a repository and can be used to create or delete triggers.</p> </li> <li> <p> <a>TestRepositoryTriggers</a>, which tests the functionality of a repository trigger by sending data to the trigger target.</p> </li> </ul> <p>For information about how to use AWS CodeCommit, see the <a href=\"https://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html\">AWS CodeCommit User Guide</a>.</p>"
 }
diff --git a/aws-java-sdk-models/src/main/resources/models/codestar-2017-04-19-intermediate.json b/aws-java-sdk-models/src/main/resources/models/codestar-2017-04-19-intermediate.json
index 9bba2bdcf628..08de446d7d5c 100644
--- a/aws-java-sdk-models/src/main/resources/models/codestar-2017-04-19-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/codestar-2017-04-19-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/comprehend-2017-11-27-intermediate.json b/aws-java-sdk-models/src/main/resources/models/comprehend-2017-11-27-intermediate.json
index 603d80e12441..2bf7165af218 100644
--- a/aws-java-sdk-models/src/main/resources/models/comprehend-2017-11-27-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/comprehend-2017-11-27-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/data.jobs.iot-2017-09-29-intermediate.json b/aws-java-sdk-models/src/main/resources/models/data.jobs.iot-2017-09-29-intermediate.json
index 1c897236ef5e..30bbfed8360e 100644
--- a/aws-java-sdk-models/src/main/resources/models/data.jobs.iot-2017-09-29-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/data.jobs.iot-2017-09-29-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/datasync-2018-11-09-intermediate.json b/aws-java-sdk-models/src/main/resources/models/datasync-2018-11-09-intermediate.json
index 4dfb94b75e1e..085ab35f3b9d 100644
--- a/aws-java-sdk-models/src/main/resources/models/datasync-2018-11-09-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/datasync-2018-11-09-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/devices.iot1click-2018-05-14-intermediate.json b/aws-java-sdk-models/src/main/resources/models/devices.iot1click-2018-05-14-intermediate.json
index c1480014d518..a94e41f563cf 100644
--- a/aws-java-sdk-models/src/main/resources/models/devices.iot1click-2018-05-14-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/devices.iot1click-2018-05-14-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "ClientMutationMethods", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/docdb-2014-10-31-intermediate.json b/aws-java-sdk-models/src/main/resources/models/docdb-2014-10-31-intermediate.json
index cede631632d7..a0542c83fcfd 100644
--- a/aws-java-sdk-models/src/main/resources/models/docdb-2014-10-31-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/docdb-2014-10-31-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "ClientMutationMethods", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/fms-2018-01-01-intermediate.json b/aws-java-sdk-models/src/main/resources/models/fms-2018-01-01-intermediate.json
index 264bee2871c1..acb18117529a 100644
--- a/aws-java-sdk-models/src/main/resources/models/fms-2018-01-01-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/fms-2018-01-01-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/globalaccelerator-2018-08-08-intermediate.json b/aws-java-sdk-models/src/main/resources/models/globalaccelerator-2018-08-08-intermediate.json
index 0f673aeddcfc..3af8e0624614 100644
--- a/aws-java-sdk-models/src/main/resources/models/globalaccelerator-2018-08-08-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/globalaccelerator-2018-08-08-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/glue-2017-03-31-intermediate.json b/aws-java-sdk-models/src/main/resources/models/glue-2017-03-31-intermediate.json
index 6cfb82e51e57..bb3293dd8f73 100644
--- a/aws-java-sdk-models/src/main/resources/models/glue-2017-03-31-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/glue-2017-03-31-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/greengrass-2017-06-07-intermediate.json b/aws-java-sdk-models/src/main/resources/models/greengrass-2017-06-07-intermediate.json
index 11618afc405e..91f9037bc8bf 100644
--- a/aws-java-sdk-models/src/main/resources/models/greengrass-2017-06-07-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/greengrass-2017-06-07-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "ClientMutationMethods", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : {
       "CreateDeploymentRequest" : [ "DeploymentType" ],
       "Logger" : [ "Component", "Level", "Type" ]
diff --git a/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-intermediate.json b/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-intermediate.json
index 12be3bb14efd..c5b4cc493754 100644
--- a/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
@@ -4187,6 +4187,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "storage",
+        "c2jShape" : "ChannelStorage",
+        "deprecated" : false,
+        "documentation" : "<p>Where channel data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param storage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStorage",
+        "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+        "getterMethodName" : "getStorage",
+        "getterModel" : {
+          "returnType" : "ChannelStorage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "storage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "storage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "Storage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param storage Where channel data is stored.*/",
+        "setterMethodName" : "setStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorage",
+          "variableName" : "storage",
+          "variableType" : "ChannelStorage",
+          "documentation" : "",
+          "simpleType" : "ChannelStorage",
+          "variableSetterType" : "ChannelStorage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param storage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorage",
+          "variableName" : "storage",
+          "variableType" : "ChannelStorage",
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "simpleType" : "ChannelStorage",
+          "variableSetterType" : "ChannelStorage"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "arn",
         "c2jShape" : "ChannelArn",
@@ -4931,6 +4998,74 @@
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "Storage" : {
+          "c2jName" : "storage",
+          "c2jShape" : "ChannelStorage",
+          "deprecated" : false,
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param storage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStorage",
+          "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+          "getterMethodName" : "getStorage",
+          "getterModel" : {
+            "returnType" : "ChannelStorage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "storage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "storage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "Storage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param storage Where channel data is stored.*/",
+          "setterMethodName" : "setStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorage",
+            "variableName" : "storage",
+            "variableType" : "ChannelStorage",
+            "documentation" : "",
+            "simpleType" : "ChannelStorage",
+            "variableSetterType" : "ChannelStorage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param storage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorage",
+            "variableName" : "storage",
+            "variableType" : "ChannelStorage",
+            "documentation" : "<p>Where channel data is stored.</p>",
+            "simpleType" : "ChannelStorage",
+            "variableSetterType" : "ChannelStorage"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
@@ -5628,6 +5763,630 @@
       },
       "wrapper" : false
     },
+    "ChannelStorage" : {
+      "c2jName" : "ChannelStorage",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Where channel data is stored.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "serviceManagedS3",
+        "c2jShape" : "ServiceManagedChannelS3Storage",
+        "deprecated" : false,
+        "documentation" : "<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServiceManagedS3",
+        "getterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "getterMethodName" : "getServiceManagedS3",
+        "getterModel" : {
+          "returnType" : "ServiceManagedChannelS3Storage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "serviceManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "serviceManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ServiceManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "setterMethodName" : "setServiceManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedChannelS3Storage",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedChannelS3Storage",
+          "documentation" : "",
+          "simpleType" : "ServiceManagedChannelS3Storage",
+          "variableSetterType" : "ServiceManagedChannelS3Storage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedChannelS3Storage",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedChannelS3Storage",
+          "documentation" : "<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "simpleType" : "ServiceManagedChannelS3Storage",
+          "variableSetterType" : "ServiceManagedChannelS3Storage"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "customerManagedS3",
+        "c2jShape" : "CustomerManagedChannelS3Storage",
+        "deprecated" : false,
+        "documentation" : "<p>Use this to store channel data in an S3 bucket that you manage.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCustomerManagedS3",
+        "getterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@return Use this to store channel data in an S3 bucket that you manage.*/",
+        "getterMethodName" : "getCustomerManagedS3",
+        "getterModel" : {
+          "returnType" : "CustomerManagedChannelS3Storage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "customerManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "customerManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "CustomerManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store channel data in an S3 bucket that you manage.*/",
+        "setterMethodName" : "setCustomerManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedChannelS3Storage",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedChannelS3Storage",
+          "documentation" : "",
+          "simpleType" : "CustomerManagedChannelS3Storage",
+          "variableSetterType" : "CustomerManagedChannelS3Storage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedChannelS3Storage",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedChannelS3Storage",
+          "documentation" : "<p>Use this to store channel data in an S3 bucket that you manage.</p>",
+          "simpleType" : "CustomerManagedChannelS3Storage",
+          "variableSetterType" : "CustomerManagedChannelS3Storage"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CustomerManagedS3" : {
+          "c2jName" : "customerManagedS3",
+          "c2jShape" : "CustomerManagedChannelS3Storage",
+          "deprecated" : false,
+          "documentation" : "<p>Use this to store channel data in an S3 bucket that you manage.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCustomerManagedS3",
+          "getterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@return Use this to store channel data in an S3 bucket that you manage.*/",
+          "getterMethodName" : "getCustomerManagedS3",
+          "getterModel" : {
+            "returnType" : "CustomerManagedChannelS3Storage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "customerManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "customerManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "CustomerManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store channel data in an S3 bucket that you manage.*/",
+          "setterMethodName" : "setCustomerManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedChannelS3Storage",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedChannelS3Storage",
+            "documentation" : "",
+            "simpleType" : "CustomerManagedChannelS3Storage",
+            "variableSetterType" : "CustomerManagedChannelS3Storage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedChannelS3Storage",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedChannelS3Storage",
+            "documentation" : "<p>Use this to store channel data in an S3 bucket that you manage.</p>",
+            "simpleType" : "CustomerManagedChannelS3Storage",
+            "variableSetterType" : "CustomerManagedChannelS3Storage"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ServiceManagedS3" : {
+          "c2jName" : "serviceManagedS3",
+          "c2jShape" : "ServiceManagedChannelS3Storage",
+          "deprecated" : false,
+          "documentation" : "<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServiceManagedS3",
+          "getterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "getterMethodName" : "getServiceManagedS3",
+          "getterModel" : {
+            "returnType" : "ServiceManagedChannelS3Storage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "serviceManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "serviceManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ServiceManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "setterMethodName" : "setServiceManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedChannelS3Storage",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedChannelS3Storage",
+            "documentation" : "",
+            "simpleType" : "ServiceManagedChannelS3Storage",
+            "variableSetterType" : "ServiceManagedChannelS3Storage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedChannelS3Storage",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedChannelS3Storage",
+            "documentation" : "<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+            "simpleType" : "ServiceManagedChannelS3Storage",
+            "variableSetterType" : "ServiceManagedChannelS3Storage"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ChannelStorage",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ChannelStorage",
+        "variableName" : "channelStorage",
+        "variableType" : "ChannelStorage",
+        "documentation" : null,
+        "simpleType" : "ChannelStorage",
+        "variableSetterType" : "ChannelStorage"
+      },
+      "wrapper" : false
+    },
+    "ChannelStorageSummary" : {
+      "c2jName" : "ChannelStorageSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Where channel data is stored.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "serviceManagedS3",
+        "c2jShape" : "ServiceManagedChannelS3StorageSummary",
+        "deprecated" : false,
+        "documentation" : "<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServiceManagedS3",
+        "getterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "getterMethodName" : "getServiceManagedS3",
+        "getterModel" : {
+          "returnType" : "ServiceManagedChannelS3StorageSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "serviceManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "serviceManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ServiceManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "setterMethodName" : "setServiceManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedChannelS3StorageSummary",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedChannelS3StorageSummary",
+          "documentation" : "",
+          "simpleType" : "ServiceManagedChannelS3StorageSummary",
+          "variableSetterType" : "ServiceManagedChannelS3StorageSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedChannelS3StorageSummary",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedChannelS3StorageSummary",
+          "documentation" : "<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "simpleType" : "ServiceManagedChannelS3StorageSummary",
+          "variableSetterType" : "ServiceManagedChannelS3StorageSummary"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "customerManagedS3",
+        "c2jShape" : "CustomerManagedChannelS3StorageSummary",
+        "deprecated" : false,
+        "documentation" : "<p>Used to store channel data in an S3 bucket that you manage.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCustomerManagedS3",
+        "getterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@return Used to store channel data in an S3 bucket that you manage.*/",
+        "getterMethodName" : "getCustomerManagedS3",
+        "getterModel" : {
+          "returnType" : "CustomerManagedChannelS3StorageSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "customerManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "customerManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "CustomerManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store channel data in an S3 bucket that you manage.*/",
+        "setterMethodName" : "setCustomerManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedChannelS3StorageSummary",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedChannelS3StorageSummary",
+          "documentation" : "",
+          "simpleType" : "CustomerManagedChannelS3StorageSummary",
+          "variableSetterType" : "CustomerManagedChannelS3StorageSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedChannelS3StorageSummary",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedChannelS3StorageSummary",
+          "documentation" : "<p>Used to store channel data in an S3 bucket that you manage.</p>",
+          "simpleType" : "CustomerManagedChannelS3StorageSummary",
+          "variableSetterType" : "CustomerManagedChannelS3StorageSummary"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CustomerManagedS3" : {
+          "c2jName" : "customerManagedS3",
+          "c2jShape" : "CustomerManagedChannelS3StorageSummary",
+          "deprecated" : false,
+          "documentation" : "<p>Used to store channel data in an S3 bucket that you manage.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCustomerManagedS3",
+          "getterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@return Used to store channel data in an S3 bucket that you manage.*/",
+          "getterMethodName" : "getCustomerManagedS3",
+          "getterModel" : {
+            "returnType" : "CustomerManagedChannelS3StorageSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "customerManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "customerManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "CustomerManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store channel data in an S3 bucket that you manage.*/",
+          "setterMethodName" : "setCustomerManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedChannelS3StorageSummary",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedChannelS3StorageSummary",
+            "documentation" : "",
+            "simpleType" : "CustomerManagedChannelS3StorageSummary",
+            "variableSetterType" : "CustomerManagedChannelS3StorageSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store channel data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedChannelS3StorageSummary",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedChannelS3StorageSummary",
+            "documentation" : "<p>Used to store channel data in an S3 bucket that you manage.</p>",
+            "simpleType" : "CustomerManagedChannelS3StorageSummary",
+            "variableSetterType" : "CustomerManagedChannelS3StorageSummary"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ServiceManagedS3" : {
+          "c2jName" : "serviceManagedS3",
+          "c2jShape" : "ServiceManagedChannelS3StorageSummary",
+          "deprecated" : false,
+          "documentation" : "<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServiceManagedS3",
+          "getterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "getterMethodName" : "getServiceManagedS3",
+          "getterModel" : {
+            "returnType" : "ServiceManagedChannelS3StorageSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "serviceManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "serviceManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ServiceManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "setterMethodName" : "setServiceManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedChannelS3StorageSummary",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedChannelS3StorageSummary",
+            "documentation" : "",
+            "simpleType" : "ServiceManagedChannelS3StorageSummary",
+            "variableSetterType" : "ServiceManagedChannelS3StorageSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedChannelS3StorageSummary",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedChannelS3StorageSummary",
+            "documentation" : "<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+            "simpleType" : "ServiceManagedChannelS3StorageSummary",
+            "variableSetterType" : "ServiceManagedChannelS3StorageSummary"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ChannelStorageSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ChannelStorageSummary",
+        "variableName" : "channelStorageSummary",
+        "variableType" : "ChannelStorageSummary",
+        "documentation" : null,
+        "simpleType" : "ChannelStorageSummary",
+        "variableSetterType" : "ChannelStorageSummary"
+      },
+      "wrapper" : false
+    },
     "ChannelSummary" : {
       "c2jName" : "ChannelSummary",
       "customization" : {
@@ -5713,6 +6472,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "channelStorage",
+        "c2jShape" : "ChannelStorageSummary",
+        "deprecated" : false,
+        "documentation" : "<p>Where channel data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withChannelStorage",
+        "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+        "getterMethodName" : "getChannelStorage",
+        "getterModel" : {
+          "returnType" : "ChannelStorageSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "channelStorage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "channelStorage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ChannelStorage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.*/",
+        "setterMethodName" : "setChannelStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorageSummary",
+          "variableName" : "channelStorage",
+          "variableType" : "ChannelStorageSummary",
+          "documentation" : "",
+          "simpleType" : "ChannelStorageSummary",
+          "variableSetterType" : "ChannelStorageSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorageSummary",
+          "variableName" : "channelStorage",
+          "variableType" : "ChannelStorageSummary",
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "simpleType" : "ChannelStorageSummary",
+          "variableSetterType" : "ChannelStorageSummary"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "status",
         "c2jShape" : "ChannelStatus",
@@ -5984,6 +6810,74 @@
           },
           "xmlNameSpaceUri" : null
         },
+        "ChannelStorage" : {
+          "c2jName" : "channelStorage",
+          "c2jShape" : "ChannelStorageSummary",
+          "deprecated" : false,
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withChannelStorage",
+          "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+          "getterMethodName" : "getChannelStorage",
+          "getterModel" : {
+            "returnType" : "ChannelStorageSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "channelStorage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "channelStorage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ChannelStorage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.*/",
+          "setterMethodName" : "setChannelStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorageSummary",
+            "variableName" : "channelStorage",
+            "variableType" : "ChannelStorageSummary",
+            "documentation" : "",
+            "simpleType" : "ChannelStorageSummary",
+            "variableSetterType" : "ChannelStorageSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorageSummary",
+            "variableName" : "channelStorage",
+            "variableType" : "ChannelStorageSummary",
+            "documentation" : "<p>Where channel data is stored.</p>",
+            "simpleType" : "ChannelStorageSummary",
+            "variableSetterType" : "ChannelStorageSummary"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "CreationTime" : {
           "c2jName" : "creationTime",
           "c2jShape" : "Timestamp",
@@ -7095,6 +7989,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "channelStorage",
+        "c2jShape" : "ChannelStorage",
+        "deprecated" : false,
+        "documentation" : "<p>Where channel data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withChannelStorage",
+        "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+        "getterMethodName" : "getChannelStorage",
+        "getterModel" : {
+          "returnType" : "ChannelStorage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "channelStorage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "channelStorage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ChannelStorage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.*/",
+        "setterMethodName" : "setChannelStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorage",
+          "variableName" : "channelStorage",
+          "variableType" : "ChannelStorage",
+          "documentation" : "",
+          "simpleType" : "ChannelStorage",
+          "variableSetterType" : "ChannelStorage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorage",
+          "variableName" : "channelStorage",
+          "variableType" : "ChannelStorage",
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "simpleType" : "ChannelStorage",
+          "variableSetterType" : "ChannelStorage"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "retentionPeriod",
         "c2jShape" : "RetentionPeriod",
@@ -7381,6 +8342,74 @@
           },
           "xmlNameSpaceUri" : null
         },
+        "ChannelStorage" : {
+          "c2jName" : "channelStorage",
+          "c2jShape" : "ChannelStorage",
+          "deprecated" : false,
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withChannelStorage",
+          "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+          "getterMethodName" : "getChannelStorage",
+          "getterModel" : {
+            "returnType" : "ChannelStorage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "channelStorage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "channelStorage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ChannelStorage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.*/",
+          "setterMethodName" : "setChannelStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorage",
+            "variableName" : "channelStorage",
+            "variableType" : "ChannelStorage",
+            "documentation" : "",
+            "simpleType" : "ChannelStorage",
+            "variableSetterType" : "ChannelStorage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorage",
+            "variableName" : "channelStorage",
+            "variableType" : "ChannelStorage",
+            "documentation" : "<p>Where channel data is stored.</p>",
+            "simpleType" : "ChannelStorage",
+            "variableSetterType" : "ChannelStorage"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "RetentionPeriod" : {
           "c2jName" : "retentionPeriod",
           "c2jShape" : "RetentionPeriod",
@@ -10609,6 +11638,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "datastoreStorage",
+        "c2jShape" : "DatastoreStorage",
+        "deprecated" : false,
+        "documentation" : "<p>Where data store data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatastoreStorage",
+        "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+        "getterMethodName" : "getDatastoreStorage",
+        "getterModel" : {
+          "returnType" : "DatastoreStorage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "datastoreStorage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "datastoreStorage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DatastoreStorage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.*/",
+        "setterMethodName" : "setDatastoreStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorage",
+          "variableName" : "datastoreStorage",
+          "variableType" : "DatastoreStorage",
+          "documentation" : "",
+          "simpleType" : "DatastoreStorage",
+          "variableSetterType" : "DatastoreStorage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorage",
+          "variableName" : "datastoreStorage",
+          "variableType" : "DatastoreStorage",
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "simpleType" : "DatastoreStorage",
+          "variableSetterType" : "DatastoreStorage"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "retentionPeriod",
         "c2jShape" : "RetentionPeriod",
@@ -10895,6 +11991,74 @@
           },
           "xmlNameSpaceUri" : null
         },
+        "DatastoreStorage" : {
+          "c2jName" : "datastoreStorage",
+          "c2jShape" : "DatastoreStorage",
+          "deprecated" : false,
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatastoreStorage",
+          "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+          "getterMethodName" : "getDatastoreStorage",
+          "getterModel" : {
+            "returnType" : "DatastoreStorage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "datastoreStorage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "datastoreStorage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DatastoreStorage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.*/",
+          "setterMethodName" : "setDatastoreStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorage",
+            "variableName" : "datastoreStorage",
+            "variableType" : "DatastoreStorage",
+            "documentation" : "",
+            "simpleType" : "DatastoreStorage",
+            "variableSetterType" : "DatastoreStorage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorage",
+            "variableName" : "datastoreStorage",
+            "variableType" : "DatastoreStorage",
+            "documentation" : "<p>Where data store data is stored.</p>",
+            "simpleType" : "DatastoreStorage",
+            "variableSetterType" : "DatastoreStorage"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "RetentionPeriod" : {
           "c2jName" : "retentionPeriod",
           "c2jShape" : "RetentionPeriod",
@@ -12091,46 +13255,1778 @@
           },
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "PipelineActivities",
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "PipelineActivities",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code> </p>\n@param pipelineActivities A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code>*/",
+          "setterMethodName" : "setPipelineActivities",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<PipelineActivity>",
+            "variableName" : "pipelineActivities",
+            "variableType" : "java.util.List<PipelineActivity>",
+            "documentation" : "",
+            "simpleType" : "List<PipelineActivity>",
+            "variableSetterType" : "java.util.Collection<PipelineActivity>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code> </p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setPipelineActivities(java.util.Collection)} or {@link #withPipelineActivities(java.util.Collection)} if you want to override the existing values.</p>\n@param pipelineActivities A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<PipelineActivity>",
+            "variableName" : "pipelineActivities",
+            "variableType" : "java.util.List<PipelineActivity>",
+            "documentation" : "<p>A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code> </p>",
+            "simpleType" : "List<PipelineActivity>",
+            "variableSetterType" : "java.util.Collection<PipelineActivity>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "PipelineName" : {
+          "c2jName" : "pipelineName",
+          "c2jShape" : "PipelineName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the pipeline.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPipelineName",
+          "getterDocumentation" : "/**<p>The name of the pipeline.</p>\n@return The name of the pipeline.*/",
+          "getterMethodName" : "getPipelineName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "pipelineName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "pipelineName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "PipelineName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.*/",
+          "setterMethodName" : "setPipelineName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pipelineName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pipelineName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the pipeline.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "TagList",
+          "deprecated" : false,
+          "documentation" : "<p>Metadata which can be used to manage the pipeline.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n@param tags Metadata which can be used to manage the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n@return Metadata which can be used to manage the pipeline.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.List<Tag>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Tag",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Tag",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Tag",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Tag",
+            "templateImplType" : "java.util.ArrayList<Tag>",
+            "templateType" : "java.util.List<Tag>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n@param tags Metadata which can be used to manage the pipeline.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags Metadata which can be used to manage the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "<p>Metadata which can be used to manage the pipeline.</p>",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "pipelineName", "pipelineActivities" ],
+      "shapeName" : "CreatePipelineRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreatePipelineRequest",
+        "variableName" : "createPipelineRequest",
+        "variableType" : "CreatePipelineRequest",
+        "documentation" : null,
+        "simpleType" : "CreatePipelineRequest",
+        "variableSetterType" : "CreatePipelineRequest"
+      },
+      "wrapper" : false
+    },
+    "CreatePipelineResult" : {
+      "c2jName" : "CreatePipelineResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "pipelineName",
+        "c2jShape" : "PipelineName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the pipeline.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPipelineName",
+        "getterDocumentation" : "/**<p>The name of the pipeline.</p>\n@return The name of the pipeline.*/",
+        "getterMethodName" : "getPipelineName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "pipelineName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "pipelineName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "PipelineName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.*/",
+        "setterMethodName" : "setPipelineName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pipelineName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pipelineName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the pipeline.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "pipelineArn",
+        "c2jShape" : "PipelineArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the pipeline.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPipelineArn",
+        "getterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@return The ARN of the pipeline.*/",
+        "getterMethodName" : "getPipelineArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "pipelineArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "pipelineArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "PipelineArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.*/",
+        "setterMethodName" : "setPipelineArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pipelineArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pipelineArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the pipeline.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "PipelineArn" : {
+          "c2jName" : "pipelineArn",
+          "c2jShape" : "PipelineArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the pipeline.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPipelineArn",
+          "getterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@return The ARN of the pipeline.*/",
+          "getterMethodName" : "getPipelineArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "pipelineArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "pipelineArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "PipelineArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.*/",
+          "setterMethodName" : "setPipelineArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pipelineArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pipelineArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the pipeline.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "PipelineName" : {
+          "c2jName" : "pipelineName",
+          "c2jShape" : "PipelineName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the pipeline.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPipelineName",
+          "getterDocumentation" : "/**<p>The name of the pipeline.</p>\n@return The name of the pipeline.*/",
+          "getterMethodName" : "getPipelineName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "pipelineName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "pipelineName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "PipelineName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.*/",
+          "setterMethodName" : "setPipelineName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pipelineName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pipelineName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the pipeline.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "CreatePipelineResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreatePipelineResult",
+        "variableName" : "createPipelineResult",
+        "variableType" : "CreatePipelineResult",
+        "documentation" : null,
+        "simpleType" : "CreatePipelineResult",
+        "variableSetterType" : "CreatePipelineResult"
+      },
+      "wrapper" : false
+    },
+    "CustomerManagedChannelS3Storage" : {
+      "c2jName" : "CustomerManagedChannelS3Storage",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Use this to store channel data in an S3 bucket that you manage.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "bucket",
+        "c2jShape" : "BucketName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBucket",
+        "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@return The name of the Amazon S3 bucket in which channel data is stored.*/",
+        "getterMethodName" : "getBucket",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "bucket",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "bucket",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Bucket",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.*/",
+        "setterMethodName" : "setBucket",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bucket",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bucket",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyPrefix",
+        "c2jShape" : "S3KeyPrefix",
+        "deprecated" : false,
+        "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyPrefix",
+        "getterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "getterMethodName" : "getKeyPrefix",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyPrefix",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyPrefix",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyPrefix",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "setterMethodName" : "setKeyPrefix",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyPrefix",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyPrefix",
+          "variableType" : "String",
+          "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "RoleArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Bucket" : {
+          "c2jName" : "bucket",
+          "c2jShape" : "BucketName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBucket",
+          "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@return The name of the Amazon S3 bucket in which channel data is stored.*/",
+          "getterMethodName" : "getBucket",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "bucket",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "bucket",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Bucket",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.*/",
+          "setterMethodName" : "setBucket",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "bucket",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "bucket",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyPrefix" : {
+          "c2jName" : "keyPrefix",
+          "c2jShape" : "S3KeyPrefix",
+          "deprecated" : false,
+          "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyPrefix",
+          "getterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "getterMethodName" : "getKeyPrefix",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "keyPrefix",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyPrefix",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyPrefix",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "setterMethodName" : "setKeyPrefix",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyPrefix",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyPrefix",
+            "variableType" : "String",
+            "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "RoleArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "bucket", "roleArn" ],
+      "shapeName" : "CustomerManagedChannelS3Storage",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CustomerManagedChannelS3Storage",
+        "variableName" : "customerManagedChannelS3Storage",
+        "variableType" : "CustomerManagedChannelS3Storage",
+        "documentation" : null,
+        "simpleType" : "CustomerManagedChannelS3Storage",
+        "variableSetterType" : "CustomerManagedChannelS3Storage"
+      },
+      "wrapper" : false
+    },
+    "CustomerManagedChannelS3StorageSummary" : {
+      "c2jName" : "CustomerManagedChannelS3StorageSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Used to store channel data in an S3 bucket that you manage.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "bucket",
+        "c2jShape" : "BucketName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBucket",
+        "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@return The name of the Amazon S3 bucket in which channel data is stored.*/",
+        "getterMethodName" : "getBucket",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "bucket",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "bucket",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Bucket",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.*/",
+        "setterMethodName" : "setBucket",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bucket",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bucket",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyPrefix",
+        "c2jShape" : "S3KeyPrefix",
+        "deprecated" : false,
+        "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyPrefix",
+        "getterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "getterMethodName" : "getKeyPrefix",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyPrefix",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyPrefix",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyPrefix",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "setterMethodName" : "setKeyPrefix",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyPrefix",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyPrefix",
+          "variableType" : "String",
+          "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "RoleArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Bucket" : {
+          "c2jName" : "bucket",
+          "c2jShape" : "BucketName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBucket",
+          "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@return The name of the Amazon S3 bucket in which channel data is stored.*/",
+          "getterMethodName" : "getBucket",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "bucket",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "bucket",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Bucket",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.*/",
+          "setterMethodName" : "setBucket",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "bucket",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which channel data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "bucket",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the Amazon S3 bucket in which channel data is stored.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyPrefix" : {
+          "c2jName" : "keyPrefix",
+          "c2jShape" : "S3KeyPrefix",
+          "deprecated" : false,
+          "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyPrefix",
+          "getterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "getterMethodName" : "getKeyPrefix",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "keyPrefix",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyPrefix",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyPrefix",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "setterMethodName" : "setKeyPrefix",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyPrefix",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyPrefix",
+            "variableType" : "String",
+            "documentation" : "<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "RoleArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "CustomerManagedChannelS3StorageSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CustomerManagedChannelS3StorageSummary",
+        "variableName" : "customerManagedChannelS3StorageSummary",
+        "variableType" : "CustomerManagedChannelS3StorageSummary",
+        "documentation" : null,
+        "simpleType" : "CustomerManagedChannelS3StorageSummary",
+        "variableSetterType" : "CustomerManagedChannelS3StorageSummary"
+      },
+      "wrapper" : false
+    },
+    "CustomerManagedDatastoreS3Storage" : {
+      "c2jName" : "CustomerManagedDatastoreS3Storage",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Use this to store data store data in an S3 bucket that you manage.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "bucket",
+        "c2jShape" : "BucketName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBucket",
+        "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@return The name of the Amazon S3 bucket in which data store data is stored.*/",
+        "getterMethodName" : "getBucket",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "bucket",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "bucket",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Bucket",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.*/",
+        "setterMethodName" : "setBucket",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bucket",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bucket",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyPrefix",
+        "c2jShape" : "S3KeyPrefix",
+        "deprecated" : false,
+        "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyPrefix",
+        "getterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "getterMethodName" : "getKeyPrefix",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyPrefix",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyPrefix",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyPrefix",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "setterMethodName" : "setKeyPrefix",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyPrefix",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyPrefix",
+          "variableType" : "String",
+          "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "RoleArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Bucket" : {
+          "c2jName" : "bucket",
+          "c2jShape" : "BucketName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBucket",
+          "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@return The name of the Amazon S3 bucket in which data store data is stored.*/",
+          "getterMethodName" : "getBucket",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "bucket",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "bucket",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Bucket",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code> </p>\n@param pipelineActivities A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code>*/",
-          "setterMethodName" : "setPipelineActivities",
+          "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.*/",
+          "setterMethodName" : "setBucket",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<PipelineActivity>",
-            "variableName" : "pipelineActivities",
-            "variableType" : "java.util.List<PipelineActivity>",
+            "variableDeclarationType" : "String",
+            "variableName" : "bucket",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<PipelineActivity>",
-            "variableSetterType" : "java.util.Collection<PipelineActivity>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code> </p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setPipelineActivities(java.util.Collection)} or {@link #withPipelineActivities(java.util.Collection)} if you want to override the existing values.</p>\n@param pipelineActivities A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<PipelineActivity>",
-            "variableName" : "pipelineActivities",
-            "variableType" : "java.util.List<PipelineActivity>",
-            "documentation" : "<p>A list of \"PipelineActivity\" objects. Activities perform transformations on your messages, such as removing, renaming or adding message attributes; filtering messages based on attribute values; invoking your Lambda functions on messages for advanced processing; or performing mathematical transformations to normalize device data.</p> <p>The list can be 2-25 <b>PipelineActivity</b> objects and must contain both a <code>channel</code> and a <code>datastore</code> activity. Each entry in the list must contain only one activity, for example:</p> <p> <code>pipelineActivities = [ { \"channel\": { ... } }, { \"lambda\": { ... } }, ... ]</code> </p>",
-            "simpleType" : "List<PipelineActivity>",
-            "variableSetterType" : "java.util.Collection<PipelineActivity>"
+            "variableDeclarationType" : "String",
+            "variableName" : "bucket",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "PipelineName" : {
-          "c2jName" : "pipelineName",
-          "c2jShape" : "PipelineName",
+        "KeyPrefix" : {
+          "c2jName" : "keyPrefix",
+          "c2jShape" : "S3KeyPrefix",
           "deprecated" : false,
-          "documentation" : "<p>The name of the pipeline.</p>",
+          "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withPipelineName",
-          "getterDocumentation" : "/**<p>The name of the pipeline.</p>\n@return The name of the pipeline.*/",
-          "getterMethodName" : "getPipelineName",
+          "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyPrefix",
+          "getterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "getterMethodName" : "getKeyPrefix",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -12145,11 +15041,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "pipelineName",
+            "marshallLocationName" : "keyPrefix",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "pipelineName",
+            "unmarshallLocationName" : "keyPrefix",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -12161,14 +15057,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "PipelineName",
+          "name" : "KeyPrefix",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.*/",
-          "setterMethodName" : "setPipelineName",
+          "setterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "setterMethodName" : "setKeyPrefix",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pipelineName",
+            "variableName" : "keyPrefix",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -12177,30 +15073,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pipelineName",
+            "variableName" : "keyPrefix",
             "variableType" : "String",
-            "documentation" : "<p>The name of the pipeline.</p>",
+            "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Tags" : {
-          "c2jName" : "tags",
-          "c2jShape" : "TagList",
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "RoleArn",
           "deprecated" : false,
-          "documentation" : "<p>Metadata which can be used to manage the pipeline.</p>",
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n@param tags Metadata which can be used to manage the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTags",
-          "getterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n@return Metadata which can be used to manage the pipeline.*/",
-          "getterMethodName" : "getTags",
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "getterMethodName" : "getRoleArn",
           "getterModel" : {
-            "returnType" : "java.util.List<Tag>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -12213,153 +15109,74 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "tags",
+            "marshallLocationName" : "roleArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "tags",
+            "unmarshallLocationName" : "roleArn",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "Tag",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "Tag",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Tag",
-                "variableName" : "member",
-                "variableType" : "Tag",
-                "documentation" : "",
-                "simpleType" : "Tag",
-                "variableSetterType" : "Tag"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Tag",
-                "variableName" : "member",
-                "variableType" : "Tag",
-                "documentation" : "",
-                "simpleType" : "Tag",
-                "variableSetterType" : "Tag"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "Tag",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "Tag",
-            "templateImplType" : "java.util.ArrayList<Tag>",
-            "templateType" : "java.util.List<Tag>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "Tags",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n@param tags Metadata which can be used to manage the pipeline.*/",
-          "setterMethodName" : "setTags",
+          "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "setterMethodName" : "setRoleArn",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Tag>",
-            "variableName" : "tags",
-            "variableType" : "java.util.List<Tag>",
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<Tag>",
-            "variableSetterType" : "java.util.Collection<Tag>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Metadata which can be used to manage the pipeline.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags Metadata which can be used to manage the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Tag>",
-            "variableName" : "tags",
-            "variableType" : "java.util.List<Tag>",
-            "documentation" : "<p>Metadata which can be used to manage the pipeline.</p>",
-            "simpleType" : "List<Tag>",
-            "variableSetterType" : "java.util.Collection<Tag>"
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "pipelineName", "pipelineActivities" ],
-      "shapeName" : "CreatePipelineRequest",
+      "required" : [ "bucket", "roleArn" ],
+      "shapeName" : "CustomerManagedDatastoreS3Storage",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "CreatePipelineRequest",
-        "variableName" : "createPipelineRequest",
-        "variableType" : "CreatePipelineRequest",
+        "variableDeclarationType" : "CustomerManagedDatastoreS3Storage",
+        "variableName" : "customerManagedDatastoreS3Storage",
+        "variableType" : "CustomerManagedDatastoreS3Storage",
         "documentation" : null,
-        "simpleType" : "CreatePipelineRequest",
-        "variableSetterType" : "CreatePipelineRequest"
+        "simpleType" : "CustomerManagedDatastoreS3Storage",
+        "variableSetterType" : "CustomerManagedDatastoreS3Storage"
       },
       "wrapper" : false
     },
-    "CreatePipelineResult" : {
-      "c2jName" : "CreatePipelineResponse",
+    "CustomerManagedDatastoreS3StorageSummary" : {
+      "c2jName" : "CustomerManagedDatastoreS3StorageSummary",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -12367,7 +15184,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "<p>Used to store data store data in an S3 bucket that you manage.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -12377,15 +15194,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "pipelineName",
-        "c2jShape" : "PipelineName",
+        "c2jName" : "bucket",
+        "c2jShape" : "BucketName",
         "deprecated" : false,
-        "documentation" : "<p>The name of the pipeline.</p>",
+        "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withPipelineName",
-        "getterDocumentation" : "/**<p>The name of the pipeline.</p>\n@return The name of the pipeline.*/",
-        "getterMethodName" : "getPipelineName",
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBucket",
+        "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@return The name of the Amazon S3 bucket in which data store data is stored.*/",
+        "getterMethodName" : "getBucket",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -12400,11 +15217,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "pipelineName",
+          "marshallLocationName" : "bucket",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "pipelineName",
+          "unmarshallLocationName" : "bucket",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -12416,14 +15233,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "PipelineName",
+        "name" : "Bucket",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.*/",
-        "setterMethodName" : "setPipelineName",
+        "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.*/",
+        "setterMethodName" : "setBucket",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "pipelineName",
+          "variableName" : "bucket",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -12432,27 +15249,27 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "pipelineName",
+          "variableName" : "bucket",
           "variableType" : "String",
-          "documentation" : "<p>The name of the pipeline.</p>",
+          "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "pipelineArn",
-        "c2jShape" : "PipelineArn",
+        "c2jName" : "keyPrefix",
+        "c2jShape" : "S3KeyPrefix",
         "deprecated" : false,
-        "documentation" : "<p>The ARN of the pipeline.</p>",
+        "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withPipelineArn",
-        "getterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@return The ARN of the pipeline.*/",
-        "getterMethodName" : "getPipelineArn",
+        "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyPrefix",
+        "getterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "getterMethodName" : "getKeyPrefix",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -12467,11 +15284,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "pipelineArn",
+          "marshallLocationName" : "keyPrefix",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "pipelineArn",
+          "unmarshallLocationName" : "keyPrefix",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -12483,14 +15300,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "PipelineArn",
+        "name" : "KeyPrefix",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.*/",
-        "setterMethodName" : "setPipelineArn",
+        "setterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+        "setterMethodName" : "setKeyPrefix",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "pipelineArn",
+          "variableName" : "keyPrefix",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -12499,29 +15316,96 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "pipelineArn",
+          "variableName" : "keyPrefix",
           "variableType" : "String",
-          "documentation" : "<p>The ARN of the pipeline.</p>",
+          "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "RoleArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "PipelineArn" : {
-          "c2jName" : "pipelineArn",
-          "c2jShape" : "PipelineArn",
+        "Bucket" : {
+          "c2jName" : "bucket",
+          "c2jShape" : "BucketName",
           "deprecated" : false,
-          "documentation" : "<p>The ARN of the pipeline.</p>",
+          "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withPipelineArn",
-          "getterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@return The ARN of the pipeline.*/",
-          "getterMethodName" : "getPipelineArn",
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBucket",
+          "getterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@return The name of the Amazon S3 bucket in which data store data is stored.*/",
+          "getterMethodName" : "getBucket",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -12536,11 +15420,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "pipelineArn",
+            "marshallLocationName" : "bucket",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "pipelineArn",
+            "unmarshallLocationName" : "bucket",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -12552,14 +15436,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "PipelineArn",
+          "name" : "Bucket",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.*/",
-          "setterMethodName" : "setPipelineArn",
+          "setterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.*/",
+          "setterMethodName" : "setBucket",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pipelineArn",
+            "variableName" : "bucket",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -12568,28 +15452,28 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The ARN of the pipeline.</p>\n@param pipelineArn The ARN of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon S3 bucket in which data store data is stored.</p>\n@param bucket The name of the Amazon S3 bucket in which data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pipelineArn",
+            "variableName" : "bucket",
             "variableType" : "String",
-            "documentation" : "<p>The ARN of the pipeline.</p>",
+            "documentation" : "<p>The name of the Amazon S3 bucket in which data store data is stored.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "PipelineName" : {
-          "c2jName" : "pipelineName",
-          "c2jShape" : "PipelineName",
+        "KeyPrefix" : {
+          "c2jName" : "keyPrefix",
+          "c2jShape" : "S3KeyPrefix",
           "deprecated" : false,
-          "documentation" : "<p>The name of the pipeline.</p>",
+          "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withPipelineName",
-          "getterDocumentation" : "/**<p>The name of the pipeline.</p>\n@return The name of the pipeline.*/",
-          "getterMethodName" : "getPipelineName",
+          "fluentSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyPrefix",
+          "getterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@return The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "getterMethodName" : "getKeyPrefix",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -12604,11 +15488,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "pipelineName",
+            "marshallLocationName" : "keyPrefix",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "pipelineName",
+            "unmarshallLocationName" : "keyPrefix",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -12620,14 +15504,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "PipelineName",
+          "name" : "KeyPrefix",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.*/",
-          "setterMethodName" : "setPipelineName",
+          "setterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).*/",
+          "setterMethodName" : "setKeyPrefix",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pipelineName",
+            "variableName" : "keyPrefix",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -12636,13 +15520,81 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the pipeline.</p>\n@param pipelineName The name of the pipeline.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>\n@param keyPrefix The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pipelineName",
+            "variableName" : "keyPrefix",
             "variableType" : "String",
-            "documentation" : "<p>The name of the pipeline.</p>",
+            "documentation" : "<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "RoleArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@return The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>\n@param roleArn The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -12652,7 +15604,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "CreatePipelineResult",
+      "shapeName" : "CustomerManagedDatastoreS3StorageSummary",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -12661,12 +15613,12 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "CreatePipelineResult",
-        "variableName" : "createPipelineResult",
-        "variableType" : "CreatePipelineResult",
+        "variableDeclarationType" : "CustomerManagedDatastoreS3StorageSummary",
+        "variableName" : "customerManagedDatastoreS3StorageSummary",
+        "variableType" : "CustomerManagedDatastoreS3StorageSummary",
         "documentation" : null,
-        "simpleType" : "CreatePipelineResult",
-        "variableSetterType" : "CreatePipelineResult"
+        "simpleType" : "CustomerManagedDatastoreS3StorageSummary",
+        "variableSetterType" : "CustomerManagedDatastoreS3StorageSummary"
       },
       "wrapper" : false
     },
@@ -19044,6 +21996,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "storage",
+        "c2jShape" : "DatastoreStorage",
+        "deprecated" : false,
+        "documentation" : "<p>Where data store data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param storage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStorage",
+        "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+        "getterMethodName" : "getStorage",
+        "getterModel" : {
+          "returnType" : "DatastoreStorage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "storage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "storage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "Storage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param storage Where data store data is stored.*/",
+        "setterMethodName" : "setStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorage",
+          "variableName" : "storage",
+          "variableType" : "DatastoreStorage",
+          "documentation" : "",
+          "simpleType" : "DatastoreStorage",
+          "variableSetterType" : "DatastoreStorage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param storage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorage",
+          "variableName" : "storage",
+          "variableType" : "DatastoreStorage",
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "simpleType" : "DatastoreStorage",
+          "variableSetterType" : "DatastoreStorage"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "arn",
         "c2jShape" : "DatastoreArn",
@@ -19788,6 +22807,74 @@
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "Storage" : {
+          "c2jName" : "storage",
+          "c2jShape" : "DatastoreStorage",
+          "deprecated" : false,
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param storage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStorage",
+          "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+          "getterMethodName" : "getStorage",
+          "getterModel" : {
+            "returnType" : "DatastoreStorage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "storage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "storage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "Storage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param storage Where data store data is stored.*/",
+          "setterMethodName" : "setStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorage",
+            "variableName" : "storage",
+            "variableType" : "DatastoreStorage",
+            "documentation" : "",
+            "simpleType" : "DatastoreStorage",
+            "variableSetterType" : "DatastoreStorage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param storage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorage",
+            "variableName" : "storage",
+            "variableType" : "DatastoreStorage",
+            "documentation" : "<p>Where data store data is stored.</p>",
+            "simpleType" : "DatastoreStorage",
+            "variableSetterType" : "DatastoreStorage"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
@@ -20350,6 +23437,630 @@
       },
       "wrapper" : false
     },
+    "DatastoreStorage" : {
+      "c2jName" : "DatastoreStorage",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Where data store data is stored.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "serviceManagedS3",
+        "c2jShape" : "ServiceManagedDatastoreS3Storage",
+        "deprecated" : false,
+        "documentation" : "<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServiceManagedS3",
+        "getterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "getterMethodName" : "getServiceManagedS3",
+        "getterModel" : {
+          "returnType" : "ServiceManagedDatastoreS3Storage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "serviceManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "serviceManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ServiceManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "setterMethodName" : "setServiceManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedDatastoreS3Storage",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedDatastoreS3Storage",
+          "documentation" : "",
+          "simpleType" : "ServiceManagedDatastoreS3Storage",
+          "variableSetterType" : "ServiceManagedDatastoreS3Storage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedDatastoreS3Storage",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedDatastoreS3Storage",
+          "documentation" : "<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "simpleType" : "ServiceManagedDatastoreS3Storage",
+          "variableSetterType" : "ServiceManagedDatastoreS3Storage"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "customerManagedS3",
+        "c2jShape" : "CustomerManagedDatastoreS3Storage",
+        "deprecated" : false,
+        "documentation" : "<p>Use this to store data store data in an S3 bucket that you manage.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCustomerManagedS3",
+        "getterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@return Use this to store data store data in an S3 bucket that you manage.*/",
+        "getterMethodName" : "getCustomerManagedS3",
+        "getterModel" : {
+          "returnType" : "CustomerManagedDatastoreS3Storage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "customerManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "customerManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "CustomerManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store data store data in an S3 bucket that you manage.*/",
+        "setterMethodName" : "setCustomerManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedDatastoreS3Storage",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedDatastoreS3Storage",
+          "documentation" : "",
+          "simpleType" : "CustomerManagedDatastoreS3Storage",
+          "variableSetterType" : "CustomerManagedDatastoreS3Storage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedDatastoreS3Storage",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedDatastoreS3Storage",
+          "documentation" : "<p>Use this to store data store data in an S3 bucket that you manage.</p>",
+          "simpleType" : "CustomerManagedDatastoreS3Storage",
+          "variableSetterType" : "CustomerManagedDatastoreS3Storage"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CustomerManagedS3" : {
+          "c2jName" : "customerManagedS3",
+          "c2jShape" : "CustomerManagedDatastoreS3Storage",
+          "deprecated" : false,
+          "documentation" : "<p>Use this to store data store data in an S3 bucket that you manage.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCustomerManagedS3",
+          "getterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@return Use this to store data store data in an S3 bucket that you manage.*/",
+          "getterMethodName" : "getCustomerManagedS3",
+          "getterModel" : {
+            "returnType" : "CustomerManagedDatastoreS3Storage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "customerManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "customerManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "CustomerManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store data store data in an S3 bucket that you manage.*/",
+          "setterMethodName" : "setCustomerManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedDatastoreS3Storage",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedDatastoreS3Storage",
+            "documentation" : "",
+            "simpleType" : "CustomerManagedDatastoreS3Storage",
+            "variableSetterType" : "CustomerManagedDatastoreS3Storage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Use this to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedDatastoreS3Storage",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedDatastoreS3Storage",
+            "documentation" : "<p>Use this to store data store data in an S3 bucket that you manage.</p>",
+            "simpleType" : "CustomerManagedDatastoreS3Storage",
+            "variableSetterType" : "CustomerManagedDatastoreS3Storage"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ServiceManagedS3" : {
+          "c2jName" : "serviceManagedS3",
+          "c2jShape" : "ServiceManagedDatastoreS3Storage",
+          "deprecated" : false,
+          "documentation" : "<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServiceManagedS3",
+          "getterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "getterMethodName" : "getServiceManagedS3",
+          "getterModel" : {
+            "returnType" : "ServiceManagedDatastoreS3Storage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "serviceManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "serviceManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ServiceManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "setterMethodName" : "setServiceManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedDatastoreS3Storage",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedDatastoreS3Storage",
+            "documentation" : "",
+            "simpleType" : "ServiceManagedDatastoreS3Storage",
+            "variableSetterType" : "ServiceManagedDatastoreS3Storage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedDatastoreS3Storage",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedDatastoreS3Storage",
+            "documentation" : "<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+            "simpleType" : "ServiceManagedDatastoreS3Storage",
+            "variableSetterType" : "ServiceManagedDatastoreS3Storage"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DatastoreStorage",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DatastoreStorage",
+        "variableName" : "datastoreStorage",
+        "variableType" : "DatastoreStorage",
+        "documentation" : null,
+        "simpleType" : "DatastoreStorage",
+        "variableSetterType" : "DatastoreStorage"
+      },
+      "wrapper" : false
+    },
+    "DatastoreStorageSummary" : {
+      "c2jName" : "DatastoreStorageSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Where data store data is stored.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "serviceManagedS3",
+        "c2jShape" : "ServiceManagedDatastoreS3StorageSummary",
+        "deprecated" : false,
+        "documentation" : "<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServiceManagedS3",
+        "getterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "getterMethodName" : "getServiceManagedS3",
+        "getterModel" : {
+          "returnType" : "ServiceManagedDatastoreS3StorageSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "serviceManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "serviceManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ServiceManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+        "setterMethodName" : "setServiceManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedDatastoreS3StorageSummary",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedDatastoreS3StorageSummary",
+          "documentation" : "",
+          "simpleType" : "ServiceManagedDatastoreS3StorageSummary",
+          "variableSetterType" : "ServiceManagedDatastoreS3StorageSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ServiceManagedDatastoreS3StorageSummary",
+          "variableName" : "serviceManagedS3",
+          "variableType" : "ServiceManagedDatastoreS3StorageSummary",
+          "documentation" : "<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "simpleType" : "ServiceManagedDatastoreS3StorageSummary",
+          "variableSetterType" : "ServiceManagedDatastoreS3StorageSummary"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "customerManagedS3",
+        "c2jShape" : "CustomerManagedDatastoreS3StorageSummary",
+        "deprecated" : false,
+        "documentation" : "<p>Used to store data store data in an S3 bucket that you manage.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCustomerManagedS3",
+        "getterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@return Used to store data store data in an S3 bucket that you manage.*/",
+        "getterMethodName" : "getCustomerManagedS3",
+        "getterModel" : {
+          "returnType" : "CustomerManagedDatastoreS3StorageSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "customerManagedS3",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "customerManagedS3",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "CustomerManagedS3",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store data store data in an S3 bucket that you manage.*/",
+        "setterMethodName" : "setCustomerManagedS3",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedDatastoreS3StorageSummary",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedDatastoreS3StorageSummary",
+          "documentation" : "",
+          "simpleType" : "CustomerManagedDatastoreS3StorageSummary",
+          "variableSetterType" : "CustomerManagedDatastoreS3StorageSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "CustomerManagedDatastoreS3StorageSummary",
+          "variableName" : "customerManagedS3",
+          "variableType" : "CustomerManagedDatastoreS3StorageSummary",
+          "documentation" : "<p>Used to store data store data in an S3 bucket that you manage.</p>",
+          "simpleType" : "CustomerManagedDatastoreS3StorageSummary",
+          "variableSetterType" : "CustomerManagedDatastoreS3StorageSummary"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CustomerManagedS3" : {
+          "c2jName" : "customerManagedS3",
+          "c2jShape" : "CustomerManagedDatastoreS3StorageSummary",
+          "deprecated" : false,
+          "documentation" : "<p>Used to store data store data in an S3 bucket that you manage.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCustomerManagedS3",
+          "getterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@return Used to store data store data in an S3 bucket that you manage.*/",
+          "getterMethodName" : "getCustomerManagedS3",
+          "getterModel" : {
+            "returnType" : "CustomerManagedDatastoreS3StorageSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "customerManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "customerManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "CustomerManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store data store data in an S3 bucket that you manage.*/",
+          "setterMethodName" : "setCustomerManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedDatastoreS3StorageSummary",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedDatastoreS3StorageSummary",
+            "documentation" : "",
+            "simpleType" : "CustomerManagedDatastoreS3StorageSummary",
+            "variableSetterType" : "CustomerManagedDatastoreS3StorageSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket that you manage.</p>\n@param customerManagedS3 Used to store data store data in an S3 bucket that you manage.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "CustomerManagedDatastoreS3StorageSummary",
+            "variableName" : "customerManagedS3",
+            "variableType" : "CustomerManagedDatastoreS3StorageSummary",
+            "documentation" : "<p>Used to store data store data in an S3 bucket that you manage.</p>",
+            "simpleType" : "CustomerManagedDatastoreS3StorageSummary",
+            "variableSetterType" : "CustomerManagedDatastoreS3StorageSummary"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ServiceManagedS3" : {
+          "c2jName" : "serviceManagedS3",
+          "c2jShape" : "ServiceManagedDatastoreS3StorageSummary",
+          "deprecated" : false,
+          "documentation" : "<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServiceManagedS3",
+          "getterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@return Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "getterMethodName" : "getServiceManagedS3",
+          "getterModel" : {
+            "returnType" : "ServiceManagedDatastoreS3StorageSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "serviceManagedS3",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "serviceManagedS3",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ServiceManagedS3",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.*/",
+          "setterMethodName" : "setServiceManagedS3",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedDatastoreS3StorageSummary",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedDatastoreS3StorageSummary",
+            "documentation" : "",
+            "simpleType" : "ServiceManagedDatastoreS3StorageSummary",
+            "variableSetterType" : "ServiceManagedDatastoreS3StorageSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>\n@param serviceManagedS3 Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ServiceManagedDatastoreS3StorageSummary",
+            "variableName" : "serviceManagedS3",
+            "variableType" : "ServiceManagedDatastoreS3StorageSummary",
+            "documentation" : "<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+            "simpleType" : "ServiceManagedDatastoreS3StorageSummary",
+            "variableSetterType" : "ServiceManagedDatastoreS3StorageSummary"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DatastoreStorageSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DatastoreStorageSummary",
+        "variableName" : "datastoreStorageSummary",
+        "variableType" : "DatastoreStorageSummary",
+        "documentation" : null,
+        "simpleType" : "DatastoreStorageSummary",
+        "variableSetterType" : "DatastoreStorageSummary"
+      },
+      "wrapper" : false
+    },
     "DatastoreSummary" : {
       "c2jName" : "DatastoreSummary",
       "customization" : {
@@ -20435,6 +24146,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "datastoreStorage",
+        "c2jShape" : "DatastoreStorageSummary",
+        "deprecated" : false,
+        "documentation" : "<p>Where data store data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatastoreStorage",
+        "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+        "getterMethodName" : "getDatastoreStorage",
+        "getterModel" : {
+          "returnType" : "DatastoreStorageSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "datastoreStorage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "datastoreStorage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DatastoreStorage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.*/",
+        "setterMethodName" : "setDatastoreStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorageSummary",
+          "variableName" : "datastoreStorage",
+          "variableType" : "DatastoreStorageSummary",
+          "documentation" : "",
+          "simpleType" : "DatastoreStorageSummary",
+          "variableSetterType" : "DatastoreStorageSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorageSummary",
+          "variableName" : "datastoreStorage",
+          "variableType" : "DatastoreStorageSummary",
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "simpleType" : "DatastoreStorageSummary",
+          "variableSetterType" : "DatastoreStorageSummary"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "status",
         "c2jShape" : "DatastoreStatus",
@@ -20774,6 +24552,74 @@
           },
           "xmlNameSpaceUri" : null
         },
+        "DatastoreStorage" : {
+          "c2jName" : "datastoreStorage",
+          "c2jShape" : "DatastoreStorageSummary",
+          "deprecated" : false,
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatastoreStorage",
+          "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+          "getterMethodName" : "getDatastoreStorage",
+          "getterModel" : {
+            "returnType" : "DatastoreStorageSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "datastoreStorage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "datastoreStorage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DatastoreStorage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.*/",
+          "setterMethodName" : "setDatastoreStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorageSummary",
+            "variableName" : "datastoreStorage",
+            "variableType" : "DatastoreStorageSummary",
+            "documentation" : "",
+            "simpleType" : "DatastoreStorageSummary",
+            "variableSetterType" : "DatastoreStorageSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorageSummary",
+            "variableName" : "datastoreStorage",
+            "variableType" : "DatastoreStorageSummary",
+            "documentation" : "<p>Where data store data is stored.</p>",
+            "simpleType" : "DatastoreStorageSummary",
+            "variableSetterType" : "DatastoreStorageSummary"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "LastUpdateTime" : {
           "c2jName" : "lastUpdateTime",
           "c2jShape" : "Timestamp",
@@ -44624,6 +48470,170 @@
       },
       "wrapper" : false
     },
+    "ServiceManagedChannelS3Storage" : {
+      "c2jName" : "ServiceManagedChannelS3Storage",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceManagedChannelS3Storage",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceManagedChannelS3Storage",
+        "variableName" : "serviceManagedChannelS3Storage",
+        "variableType" : "ServiceManagedChannelS3Storage",
+        "documentation" : null,
+        "simpleType" : "ServiceManagedChannelS3Storage",
+        "variableSetterType" : "ServiceManagedChannelS3Storage"
+      },
+      "wrapper" : false
+    },
+    "ServiceManagedChannelS3StorageSummary" : {
+      "c2jName" : "ServiceManagedChannelS3StorageSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceManagedChannelS3StorageSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceManagedChannelS3StorageSummary",
+        "variableName" : "serviceManagedChannelS3StorageSummary",
+        "variableType" : "ServiceManagedChannelS3StorageSummary",
+        "documentation" : null,
+        "simpleType" : "ServiceManagedChannelS3StorageSummary",
+        "variableSetterType" : "ServiceManagedChannelS3StorageSummary"
+      },
+      "wrapper" : false
+    },
+    "ServiceManagedDatastoreS3Storage" : {
+      "c2jName" : "ServiceManagedDatastoreS3Storage",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceManagedDatastoreS3Storage",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceManagedDatastoreS3Storage",
+        "variableName" : "serviceManagedDatastoreS3Storage",
+        "variableType" : "ServiceManagedDatastoreS3Storage",
+        "documentation" : null,
+        "simpleType" : "ServiceManagedDatastoreS3Storage",
+        "variableSetterType" : "ServiceManagedDatastoreS3Storage"
+      },
+      "wrapper" : false
+    },
+    "ServiceManagedDatastoreS3StorageSummary" : {
+      "c2jName" : "ServiceManagedDatastoreS3StorageSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceManagedDatastoreS3StorageSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceManagedDatastoreS3StorageSummary",
+        "variableName" : "serviceManagedDatastoreS3StorageSummary",
+        "variableType" : "ServiceManagedDatastoreS3StorageSummary",
+        "documentation" : null,
+        "simpleType" : "ServiceManagedDatastoreS3StorageSummary",
+        "variableSetterType" : "ServiceManagedDatastoreS3StorageSummary"
+      },
+      "wrapper" : false
+    },
     "ServiceUnavailableException" : {
       "c2jName" : "ServiceUnavailableException",
       "customization" : {
@@ -47427,6 +51437,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "channelStorage",
+        "c2jShape" : "ChannelStorage",
+        "deprecated" : false,
+        "documentation" : "<p>Where channel data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withChannelStorage",
+        "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+        "getterMethodName" : "getChannelStorage",
+        "getterModel" : {
+          "returnType" : "ChannelStorage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "channelStorage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "channelStorage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ChannelStorage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.*/",
+        "setterMethodName" : "setChannelStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorage",
+          "variableName" : "channelStorage",
+          "variableType" : "ChannelStorage",
+          "documentation" : "",
+          "simpleType" : "ChannelStorage",
+          "variableSetterType" : "ChannelStorage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ChannelStorage",
+          "variableName" : "channelStorage",
+          "variableType" : "ChannelStorage",
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "simpleType" : "ChannelStorage",
+          "variableSetterType" : "ChannelStorage"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "retentionPeriod",
         "c2jShape" : "RetentionPeriod",
@@ -47564,6 +51641,74 @@
           },
           "xmlNameSpaceUri" : null
         },
+        "ChannelStorage" : {
+          "c2jName" : "channelStorage",
+          "c2jShape" : "ChannelStorage",
+          "deprecated" : false,
+          "documentation" : "<p>Where channel data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withChannelStorage",
+          "getterDocumentation" : "/**<p>Where channel data is stored.</p>\n@return Where channel data is stored.*/",
+          "getterMethodName" : "getChannelStorage",
+          "getterModel" : {
+            "returnType" : "ChannelStorage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "channelStorage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "channelStorage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ChannelStorage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.*/",
+          "setterMethodName" : "setChannelStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorage",
+            "variableName" : "channelStorage",
+            "variableType" : "ChannelStorage",
+            "documentation" : "",
+            "simpleType" : "ChannelStorage",
+            "variableSetterType" : "ChannelStorage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where channel data is stored.</p>\n@param channelStorage Where channel data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ChannelStorage",
+            "variableName" : "channelStorage",
+            "variableType" : "ChannelStorage",
+            "documentation" : "<p>Where channel data is stored.</p>",
+            "simpleType" : "ChannelStorage",
+            "variableSetterType" : "ChannelStorage"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "RetentionPeriod" : {
           "c2jName" : "retentionPeriod",
           "c2jShape" : "RetentionPeriod",
@@ -49240,6 +53385,73 @@
           "variableSetterType" : "RetentionPeriod"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "datastoreStorage",
+        "c2jShape" : "DatastoreStorage",
+        "deprecated" : false,
+        "documentation" : "<p>Where data store data is stored.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatastoreStorage",
+        "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+        "getterMethodName" : "getDatastoreStorage",
+        "getterModel" : {
+          "returnType" : "DatastoreStorage",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "datastoreStorage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "datastoreStorage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DatastoreStorage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.*/",
+        "setterMethodName" : "setDatastoreStorage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorage",
+          "variableName" : "datastoreStorage",
+          "variableType" : "DatastoreStorage",
+          "documentation" : "",
+          "simpleType" : "DatastoreStorage",
+          "variableSetterType" : "DatastoreStorage"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DatastoreStorage",
+          "variableName" : "datastoreStorage",
+          "variableType" : "DatastoreStorage",
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "simpleType" : "DatastoreStorage",
+          "variableSetterType" : "DatastoreStorage"
+        },
+        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
         "DatastoreName" : {
@@ -49310,6 +53522,74 @@
           },
           "xmlNameSpaceUri" : null
         },
+        "DatastoreStorage" : {
+          "c2jName" : "datastoreStorage",
+          "c2jShape" : "DatastoreStorage",
+          "deprecated" : false,
+          "documentation" : "<p>Where data store data is stored.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatastoreStorage",
+          "getterDocumentation" : "/**<p>Where data store data is stored.</p>\n@return Where data store data is stored.*/",
+          "getterMethodName" : "getDatastoreStorage",
+          "getterModel" : {
+            "returnType" : "DatastoreStorage",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "datastoreStorage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "datastoreStorage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DatastoreStorage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.*/",
+          "setterMethodName" : "setDatastoreStorage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorage",
+            "variableName" : "datastoreStorage",
+            "variableType" : "DatastoreStorage",
+            "documentation" : "",
+            "simpleType" : "DatastoreStorage",
+            "variableSetterType" : "DatastoreStorage"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Where data store data is stored.</p>\n@param datastoreStorage Where data store data is stored.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DatastoreStorage",
+            "variableName" : "datastoreStorage",
+            "variableType" : "DatastoreStorage",
+            "documentation" : "<p>Where data store data is stored.</p>",
+            "simpleType" : "DatastoreStorage",
+            "variableSetterType" : "DatastoreStorage"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "RetentionPeriod" : {
           "c2jName" : "retentionPeriod",
           "c2jShape" : "RetentionPeriod",
diff --git a/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-model.json b/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-model.json
index 85ff4a3102e0..fa9d06b7e453 100644
--- a/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/iotanalytics-2017-11-27-model.json
@@ -739,6 +739,10 @@
           "shape":"ChannelName",
           "documentation":"<p>The name of the channel.</p>"
         },
+        "storage":{
+          "shape":"ChannelStorage",
+          "documentation":"<p>Where channel data is stored.</p>"
+        },
         "arn":{
           "shape":"ChannelArn",
           "documentation":"<p>The ARN of the channel.</p>"
@@ -809,6 +813,34 @@
         "DELETING"
       ]
     },
+    "ChannelStorage":{
+      "type":"structure",
+      "members":{
+        "serviceManagedS3":{
+          "shape":"ServiceManagedChannelS3Storage",
+          "documentation":"<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+        },
+        "customerManagedS3":{
+          "shape":"CustomerManagedChannelS3Storage",
+          "documentation":"<p>Use this to store channel data in an S3 bucket that you manage.</p>"
+        }
+      },
+      "documentation":"<p>Where channel data is stored.</p>"
+    },
+    "ChannelStorageSummary":{
+      "type":"structure",
+      "members":{
+        "serviceManagedS3":{
+          "shape":"ServiceManagedChannelS3StorageSummary",
+          "documentation":"<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+        },
+        "customerManagedS3":{
+          "shape":"CustomerManagedChannelS3StorageSummary",
+          "documentation":"<p>Used to store channel data in an S3 bucket that you manage.</p>"
+        }
+      },
+      "documentation":"<p>Where channel data is stored.</p>"
+    },
     "ChannelSummaries":{
       "type":"list",
       "member":{"shape":"ChannelSummary"}
@@ -820,6 +852,10 @@
           "shape":"ChannelName",
           "documentation":"<p>The name of the channel.</p>"
         },
+        "channelStorage":{
+          "shape":"ChannelStorageSummary",
+          "documentation":"<p>Where channel data is stored.</p>"
+        },
         "status":{
           "shape":"ChannelStatus",
           "documentation":"<p>The status of the channel.</p>"
@@ -877,6 +913,10 @@
           "shape":"ChannelName",
           "documentation":"<p>The name of the channel.</p>"
         },
+        "channelStorage":{
+          "shape":"ChannelStorage",
+          "documentation":"<p>Where channel data is stored.</p>"
+        },
         "retentionPeriod":{
           "shape":"RetentionPeriod",
           "documentation":"<p>How long, in days, message data is kept for the channel.</p>"
@@ -987,6 +1027,10 @@
           "shape":"DatastoreName",
           "documentation":"<p>The name of the data store.</p>"
         },
+        "datastoreStorage":{
+          "shape":"DatastoreStorage",
+          "documentation":"<p>Where data store data is stored.</p>"
+        },
         "retentionPeriod":{
           "shape":"RetentionPeriod",
           "documentation":"<p>How long, in days, message data is kept for the data store.</p>"
@@ -1048,6 +1092,86 @@
         }
       }
     },
+    "CustomerManagedChannelS3Storage":{
+      "type":"structure",
+      "required":[
+        "bucket",
+        "roleArn"
+      ],
+      "members":{
+        "bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the Amazon S3 bucket in which channel data is stored.</p>"
+        },
+        "keyPrefix":{
+          "shape":"S3KeyPrefix",
+          "documentation":"<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>"
+        }
+      },
+      "documentation":"<p>Use this to store channel data in an S3 bucket that you manage.</p>"
+    },
+    "CustomerManagedChannelS3StorageSummary":{
+      "type":"structure",
+      "members":{
+        "bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the Amazon S3 bucket in which channel data is stored.</p>"
+        },
+        "keyPrefix":{
+          "shape":"S3KeyPrefix",
+          "documentation":"<p>The prefix used to create the keys of the channel data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>"
+        }
+      },
+      "documentation":"<p>Used to store channel data in an S3 bucket that you manage.</p>"
+    },
+    "CustomerManagedDatastoreS3Storage":{
+      "type":"structure",
+      "required":[
+        "bucket",
+        "roleArn"
+      ],
+      "members":{
+        "bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the Amazon S3 bucket in which data store data is stored.</p>"
+        },
+        "keyPrefix":{
+          "shape":"S3KeyPrefix",
+          "documentation":"<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>"
+        }
+      },
+      "documentation":"<p>Use this to store data store data in an S3 bucket that you manage.</p>"
+    },
+    "CustomerManagedDatastoreS3StorageSummary":{
+      "type":"structure",
+      "members":{
+        "bucket":{
+          "shape":"BucketName",
+          "documentation":"<p>The name of the Amazon S3 bucket in which data store data is stored.</p>"
+        },
+        "keyPrefix":{
+          "shape":"S3KeyPrefix",
+          "documentation":"<p>The prefix used to create the keys of the data store data objects. Each object in an Amazon S3 bucket has a key that is its unique identifier within the bucket (each object in a bucket has exactly one key).</p>"
+        },
+        "roleArn":{
+          "shape":"RoleArn",
+          "documentation":"<p>The ARN of the role which grants AWS IoT Analytics permission to interact with your Amazon S3 resources.</p>"
+        }
+      },
+      "documentation":"<p>Used to store data store data in an S3 bucket that you manage.</p>"
+    },
     "Dataset":{
       "type":"structure",
       "members":{
@@ -1344,6 +1468,10 @@
           "shape":"DatastoreName",
           "documentation":"<p>The name of the data store.</p>"
         },
+        "storage":{
+          "shape":"DatastoreStorage",
+          "documentation":"<p>Where data store data is stored.</p>"
+        },
         "arn":{
           "shape":"DatastoreArn",
           "documentation":"<p>The ARN of the data store.</p>"
@@ -1410,6 +1538,34 @@
         "DELETING"
       ]
     },
+    "DatastoreStorage":{
+      "type":"structure",
+      "members":{
+        "serviceManagedS3":{
+          "shape":"ServiceManagedDatastoreS3Storage",
+          "documentation":"<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+        },
+        "customerManagedS3":{
+          "shape":"CustomerManagedDatastoreS3Storage",
+          "documentation":"<p>Use this to store data store data in an S3 bucket that you manage.</p>"
+        }
+      },
+      "documentation":"<p>Where data store data is stored.</p>"
+    },
+    "DatastoreStorageSummary":{
+      "type":"structure",
+      "members":{
+        "serviceManagedS3":{
+          "shape":"ServiceManagedDatastoreS3StorageSummary",
+          "documentation":"<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+        },
+        "customerManagedS3":{
+          "shape":"CustomerManagedDatastoreS3StorageSummary",
+          "documentation":"<p>Used to store data store data in an S3 bucket that you manage.</p>"
+        }
+      },
+      "documentation":"<p>Where data store data is stored.</p>"
+    },
     "DatastoreSummaries":{
       "type":"list",
       "member":{"shape":"DatastoreSummary"}
@@ -1421,6 +1577,10 @@
           "shape":"DatastoreName",
           "documentation":"<p>The name of the data store.</p>"
         },
+        "datastoreStorage":{
+          "shape":"DatastoreStorageSummary",
+          "documentation":"<p>Where data store data is stored.</p>"
+        },
         "status":{
           "shape":"DatastoreStatus",
           "documentation":"<p>The status of the data store.</p>"
@@ -2546,6 +2706,12 @@
       },
       "documentation":"<p>Configuration information for delivery of data set contents to Amazon S3.</p>"
     },
+    "S3KeyPrefix":{
+      "type":"string",
+      "max":255,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9!_.*'()/{}:-]*/$"
+    },
     "SampleChannelDataRequest":{
       "type":"structure",
       "required":["channelName"],
@@ -2618,6 +2784,30 @@
       },
       "documentation":"<p>Creates a new message using only the specified attributes from the original message.</p>"
     },
+    "ServiceManagedChannelS3Storage":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Use this to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+    },
+    "ServiceManagedChannelS3StorageSummary":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Used to store channel data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+    },
+    "ServiceManagedDatastoreS3Storage":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Use this to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+    },
+    "ServiceManagedDatastoreS3StorageSummary":{
+      "type":"structure",
+      "members":{
+      },
+      "documentation":"<p>Used to store data store data in an S3 bucket managed by the AWS IoT Analytics service.</p>"
+    },
     "ServiceUnavailableException":{
       "type":"structure",
       "members":{
@@ -2804,6 +2994,10 @@
           "location":"uri",
           "locationName":"channelName"
         },
+        "channelStorage":{
+          "shape":"ChannelStorage",
+          "documentation":"<p>Where channel data is stored.</p>"
+        },
         "retentionPeriod":{
           "shape":"RetentionPeriod",
           "documentation":"<p>How long, in days, message data is kept for the channel.</p>"
@@ -2858,6 +3052,10 @@
         "retentionPeriod":{
           "shape":"RetentionPeriod",
           "documentation":"<p>How long, in days, message data is kept for the data store.</p>"
+        },
+        "datastoreStorage":{
+          "shape":"DatastoreStorage",
+          "documentation":"<p>Where data store data is stored.</p>"
         }
       }
     },
diff --git a/aws-java-sdk-models/src/main/resources/models/iotevents-2018-07-27-intermediate.json b/aws-java-sdk-models/src/main/resources/models/iotevents-2018-07-27-intermediate.json
new file mode 100644
index 000000000000..6ebaabb9398d
--- /dev/null
+++ b/aws-java-sdk-models/src/main/resources/models/iotevents-2018-07-27-intermediate.json
@@ -0,0 +1,23898 @@
+{
+  "customizationConfig" : {
+    "additionalShapeConstructors" : null,
+    "authPolicyActions" : {
+      "actionPrefix" : null,
+      "additionalOperations" : null,
+      "fileNamePrefix" : null,
+      "skip" : true
+    },
+    "calculateCRC32FromCompressedData" : false,
+    "contentTypeOverride" : null,
+    "convenienceTypeOverloads" : [ ],
+    "customClientConfigFactory" : null,
+    "customCodeTemplates" : null,
+    "customErrorCodeFieldName" : null,
+    "customExceptionUnmarshallerImpl" : null,
+    "customFileHeader" : null,
+    "customResponseHandlerFqcn" : null,
+    "customResponseMetadataClassName" : null,
+    "customServiceMetadata" : null,
+    "customServiceNameForRequest" : null,
+    "customSignerProvider" : null,
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "emitLegacyEnumSetterFor" : null,
+    "operationModifiers" : null,
+    "operationsWithResponseStreamContentLengthValidation" : null,
+    "presignersFqcn" : null,
+    "renameShapes" : null,
+    "requestMetrics" : null,
+    "requiredParamValidationEnabled" : false,
+    "sdkModeledExceptionBaseClassName" : null,
+    "sendEmptyAutoConstructedListAsEmptyList" : null,
+    "sendExplicitlyEmptyListsForQuery" : false,
+    "serviceClientHoldInputStream" : false,
+    "shapeModifiers" : null,
+    "shapeSubstitutions" : null,
+    "simpleMethods" : null,
+    "skipClientMethodForOperations" : [ ],
+    "skipInterfaceAdditions" : false,
+    "skipSmokeTests" : true,
+    "transformDirectory" : "transform",
+    "useAutoConstructList" : false,
+    "useAutoConstructMap" : false,
+    "useUidAsFilePrefix" : true
+  },
+  "metadata" : {
+    "apiVersion" : "2018-07-27",
+    "asyncClient" : "AWSIoTEventsAsyncClient",
+    "asyncClientBuilderClassName" : "AWSIoTEventsAsyncClientBuilder",
+    "asyncInterface" : "AWSIoTEventsAsync",
+    "cborProtocol" : false,
+    "checksumFormat" : null,
+    "contentType" : "",
+    "cucumberModuleInjectorClassName" : "AWSIoTEventsModuleInjector",
+    "defaultEndpoint" : "iotevents.us-east-1.amazonaws.com",
+    "defaultEndpointWithoutHttpProtocol" : "iotevents.us-east-1.amazonaws.com",
+    "defaultRegion" : null,
+    "documentation" : "<p>AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions when such events occur.</p>",
+    "endpointPrefix" : "iotevents",
+    "hasApiWithStreamInput" : false,
+    "ionProtocol" : false,
+    "jsonProtocol" : true,
+    "jsonVersion" : "1.1",
+    "packageName" : "com.amazonaws.services.iotevents",
+    "packagePath" : "com/amazonaws/services/iotevents",
+    "protocol" : "rest-json",
+    "protocolDefaultExceptionUmarshallerImpl" : null,
+    "protocolFactory" : "com.amazonaws.protocol.json.SdkJsonProtocolFactory",
+    "requestBaseFqcn" : "com.amazonaws.AmazonWebServiceRequest",
+    "requiresApiKey" : false,
+    "requiresIamSigners" : false,
+    "serviceAbbreviation" : null,
+    "serviceFullName" : "AWS IoT Events",
+    "serviceId" : "IoT Events",
+    "serviceName" : "AWS IoT Events",
+    "signingName" : "iotevents",
+    "smokeTestsPackageName" : "com.amazonaws.services.iotevents.smoketests",
+    "syncClient" : "AWSIoTEventsClient",
+    "syncClientBuilderClassName" : "AWSIoTEventsClientBuilder",
+    "syncInterface" : "AWSIoTEvents",
+    "uid" : "iotevents-2018-07-27",
+    "unmarshallerClassSuffix" : "JsonUnmarshaller",
+    "unmarshallerContextClassName" : "JsonUnmarshallerContext",
+    "xmlProtocol" : false
+  },
+  "operations" : {
+    "CreateDetectorModel" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<CreateDetectorModelResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<CreateDetectorModelResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<CreateDetectorModelRequest, CreateDetectorModelResult>",
+      "asyncReturnType" : "CreateDetectorModelResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Creates a detector model.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "ResourceAlreadyExistsException",
+        "documentation" : "<p>The resource already exists.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "LimitExceededException",
+        "documentation" : "<p>A limit was exceeded.</p>",
+        "httpStatusCode" : 410
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreateDetectorModelRequest",
+        "variableName" : "createDetectorModelRequest",
+        "variableType" : "CreateDetectorModelRequest",
+        "documentation" : "",
+        "simpleType" : "CreateDetectorModelRequest",
+        "variableSetterType" : "CreateDetectorModelRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "createDetectorModel",
+      "operationName" : "CreateDetectorModel",
+      "returnType" : {
+        "returnType" : "CreateDetectorModelResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "CreateDetectorModelResult"
+    },
+    "CreateInput" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<CreateInputResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<CreateInputResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<CreateInputRequest, CreateInputResult>",
+      "asyncReturnType" : "CreateInputResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Creates an input.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "ResourceAlreadyExistsException",
+        "documentation" : "<p>The resource already exists.</p>",
+        "httpStatusCode" : 409
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreateInputRequest",
+        "variableName" : "createInputRequest",
+        "variableType" : "CreateInputRequest",
+        "documentation" : "",
+        "simpleType" : "CreateInputRequest",
+        "variableSetterType" : "CreateInputRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "createInput",
+      "operationName" : "CreateInput",
+      "returnType" : {
+        "returnType" : "CreateInputResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "CreateInputResult"
+    },
+    "DeleteDetectorModel" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DeleteDetectorModelResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DeleteDetectorModelResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DeleteDetectorModelRequest, DeleteDetectorModelResult>",
+      "asyncReturnType" : "DeleteDetectorModelResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Deletes a detector model. Any active instances of the detector model are also deleted.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteDetectorModelRequest",
+        "variableName" : "deleteDetectorModelRequest",
+        "variableType" : "DeleteDetectorModelRequest",
+        "documentation" : "",
+        "simpleType" : "DeleteDetectorModelRequest",
+        "variableSetterType" : "DeleteDetectorModelRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "deleteDetectorModel",
+      "operationName" : "DeleteDetectorModel",
+      "returnType" : {
+        "returnType" : "DeleteDetectorModelResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "DeleteDetectorModelResult"
+    },
+    "DeleteInput" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DeleteInputResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DeleteInputResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DeleteInputRequest, DeleteInputResult>",
+      "asyncReturnType" : "DeleteInputResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Deletes an input.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteInputRequest",
+        "variableName" : "deleteInputRequest",
+        "variableType" : "DeleteInputRequest",
+        "documentation" : "",
+        "simpleType" : "DeleteInputRequest",
+        "variableSetterType" : "DeleteInputRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "deleteInput",
+      "operationName" : "DeleteInput",
+      "returnType" : {
+        "returnType" : "DeleteInputResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "DeleteInputResult"
+    },
+    "DescribeDetectorModel" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DescribeDetectorModelResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DescribeDetectorModelResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DescribeDetectorModelRequest, DescribeDetectorModelResult>",
+      "asyncReturnType" : "DescribeDetectorModelResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest version is returned.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeDetectorModelRequest",
+        "variableName" : "describeDetectorModelRequest",
+        "variableType" : "DescribeDetectorModelRequest",
+        "documentation" : "",
+        "simpleType" : "DescribeDetectorModelRequest",
+        "variableSetterType" : "DescribeDetectorModelRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "describeDetectorModel",
+      "operationName" : "DescribeDetectorModel",
+      "returnType" : {
+        "returnType" : "DescribeDetectorModelResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "DescribeDetectorModelResult"
+    },
+    "DescribeInput" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DescribeInputResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DescribeInputResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DescribeInputRequest, DescribeInputResult>",
+      "asyncReturnType" : "DescribeInputResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Describes an input.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeInputRequest",
+        "variableName" : "describeInputRequest",
+        "variableType" : "DescribeInputRequest",
+        "documentation" : "",
+        "simpleType" : "DescribeInputRequest",
+        "variableSetterType" : "DescribeInputRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "describeInput",
+      "operationName" : "DescribeInput",
+      "returnType" : {
+        "returnType" : "DescribeInputResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "DescribeInputResult"
+    },
+    "DescribeLoggingOptions" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DescribeLoggingOptionsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DescribeLoggingOptionsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DescribeLoggingOptionsRequest, DescribeLoggingOptionsResult>",
+      "asyncReturnType" : "DescribeLoggingOptionsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Retrieves the current settings of the AWS IoT Events logging options.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "UnsupportedOperationException",
+        "documentation" : "<p>The requested operation is not supported.</p>",
+        "httpStatusCode" : 501
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeLoggingOptionsRequest",
+        "variableName" : "describeLoggingOptionsRequest",
+        "variableType" : "DescribeLoggingOptionsRequest",
+        "documentation" : "",
+        "simpleType" : "DescribeLoggingOptionsRequest",
+        "variableSetterType" : "DescribeLoggingOptionsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "describeLoggingOptions",
+      "operationName" : "DescribeLoggingOptions",
+      "returnType" : {
+        "returnType" : "DescribeLoggingOptionsResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "DescribeLoggingOptionsResult"
+    },
+    "ListDetectorModelVersions" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListDetectorModelVersionsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListDetectorModelVersionsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListDetectorModelVersionsRequest, ListDetectorModelVersionsResult>",
+      "asyncReturnType" : "ListDetectorModelVersionsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Lists all the versions of a detector model. Only the metadata associated with each detector model version is returned.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorModelVersionsRequest",
+        "variableName" : "listDetectorModelVersionsRequest",
+        "variableType" : "ListDetectorModelVersionsRequest",
+        "documentation" : "",
+        "simpleType" : "ListDetectorModelVersionsRequest",
+        "variableSetterType" : "ListDetectorModelVersionsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listDetectorModelVersions",
+      "operationName" : "ListDetectorModelVersions",
+      "returnType" : {
+        "returnType" : "ListDetectorModelVersionsResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListDetectorModelVersionsResult"
+    },
+    "ListDetectorModels" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListDetectorModelsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListDetectorModelsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListDetectorModelsRequest, ListDetectorModelsResult>",
+      "asyncReturnType" : "ListDetectorModelsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Lists the detector models you have created. Only the metadata associated with each detector model is returned.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorModelsRequest",
+        "variableName" : "listDetectorModelsRequest",
+        "variableType" : "ListDetectorModelsRequest",
+        "documentation" : "",
+        "simpleType" : "ListDetectorModelsRequest",
+        "variableSetterType" : "ListDetectorModelsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listDetectorModels",
+      "operationName" : "ListDetectorModels",
+      "returnType" : {
+        "returnType" : "ListDetectorModelsResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListDetectorModelsResult"
+    },
+    "ListInputs" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListInputsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListInputsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListInputsRequest, ListInputsResult>",
+      "asyncReturnType" : "ListInputsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Lists the inputs you have created.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListInputsRequest",
+        "variableName" : "listInputsRequest",
+        "variableType" : "ListInputsRequest",
+        "documentation" : "",
+        "simpleType" : "ListInputsRequest",
+        "variableSetterType" : "ListInputsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listInputs",
+      "operationName" : "ListInputs",
+      "returnType" : {
+        "returnType" : "ListInputsResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListInputsResult"
+    },
+    "ListTagsForResource" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListTagsForResourceResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListTagsForResourceResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListTagsForResourceRequest, ListTagsForResourceResult>",
+      "asyncReturnType" : "ListTagsForResourceResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Lists the tags (metadata) you have assigned to the resource.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListTagsForResourceRequest",
+        "variableName" : "listTagsForResourceRequest",
+        "variableType" : "ListTagsForResourceRequest",
+        "documentation" : "",
+        "simpleType" : "ListTagsForResourceRequest",
+        "variableSetterType" : "ListTagsForResourceRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listTagsForResource",
+      "operationName" : "ListTagsForResource",
+      "returnType" : {
+        "returnType" : "ListTagsForResourceResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListTagsForResourceResult"
+    },
+    "PutLoggingOptions" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<PutLoggingOptionsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<PutLoggingOptionsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<PutLoggingOptionsRequest, PutLoggingOptionsResult>",
+      "asyncReturnType" : "PutLoggingOptionsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Sets or updates the AWS IoT Events logging options.</p> <p>Note that if you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the change to take effect. Also, if you change the policy attached to the role you specified in the roleArn field (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "UnsupportedOperationException",
+        "documentation" : "<p>The requested operation is not supported.</p>",
+        "httpStatusCode" : 501
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "PutLoggingOptionsRequest",
+        "variableName" : "putLoggingOptionsRequest",
+        "variableType" : "PutLoggingOptionsRequest",
+        "documentation" : "",
+        "simpleType" : "PutLoggingOptionsRequest",
+        "variableSetterType" : "PutLoggingOptionsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "putLoggingOptions",
+      "operationName" : "PutLoggingOptions",
+      "returnType" : {
+        "returnType" : "PutLoggingOptionsResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "PutLoggingOptionsResult"
+    },
+    "TagResource" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<TagResourceResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<TagResourceResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<TagResourceRequest, TagResourceResult>",
+      "asyncReturnType" : "TagResourceResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Add to or modifies the tags of the given resource. Tags are metadata which can be used to manage a resource.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "LimitExceededException",
+        "documentation" : "<p>A limit was exceeded.</p>",
+        "httpStatusCode" : 410
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceRequest",
+        "variableName" : "tagResourceRequest",
+        "variableType" : "TagResourceRequest",
+        "documentation" : "",
+        "simpleType" : "TagResourceRequest",
+        "variableSetterType" : "TagResourceRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "tagResource",
+      "operationName" : "TagResource",
+      "returnType" : {
+        "returnType" : "TagResourceResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "TagResourceResult"
+    },
+    "UntagResource" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<UntagResourceResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<UntagResourceResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<UntagResourceRequest, UntagResourceResult>",
+      "asyncReturnType" : "UntagResourceResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Removes the given tags (metadata) from the resource.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceRequest",
+        "variableName" : "untagResourceRequest",
+        "variableType" : "UntagResourceRequest",
+        "documentation" : "",
+        "simpleType" : "UntagResourceRequest",
+        "variableSetterType" : "UntagResourceRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "untagResource",
+      "operationName" : "UntagResource",
+      "returnType" : {
+        "returnType" : "UntagResourceResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "UntagResourceResult"
+    },
+    "UpdateDetectorModel" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<UpdateDetectorModelResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<UpdateDetectorModelResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<UpdateDetectorModelRequest, UpdateDetectorModelResult>",
+      "asyncReturnType" : "UpdateDetectorModelResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Updates a detector model. Detectors (instances) spawned by the previous version will be deleted and re-created as new inputs arrive.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateDetectorModelRequest",
+        "variableName" : "updateDetectorModelRequest",
+        "variableType" : "UpdateDetectorModelRequest",
+        "documentation" : "",
+        "simpleType" : "UpdateDetectorModelRequest",
+        "variableSetterType" : "UpdateDetectorModelRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "updateDetectorModel",
+      "operationName" : "UpdateDetectorModel",
+      "returnType" : {
+        "returnType" : "UpdateDetectorModelResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "UpdateDetectorModelResult"
+    },
+    "UpdateInput" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<UpdateInputResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<UpdateInputResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<UpdateInputRequest, UpdateInputResult>",
+      "asyncReturnType" : "UpdateInputResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Updates an input.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "ResourceInUseException",
+        "documentation" : "<p>The resource is in use.</p>",
+        "httpStatusCode" : 409
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateInputRequest",
+        "variableName" : "updateInputRequest",
+        "variableType" : "UpdateInputRequest",
+        "documentation" : "",
+        "simpleType" : "UpdateInputRequest",
+        "variableSetterType" : "UpdateInputRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "updateInput",
+      "operationName" : "UpdateInput",
+      "returnType" : {
+        "returnType" : "UpdateInputResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "UpdateInputResult"
+    }
+  },
+  "shapes" : {
+    "Action" : {
+      "c2jName" : "Action",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>An action to be performed when the <code>condition</code> is TRUE.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "setVariable",
+        "c2jShape" : "SetVariableAction",
+        "deprecated" : false,
+        "documentation" : "<p>Sets a variable to a specified value.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@param setVariable Sets a variable to a specified value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSetVariable",
+        "getterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@return Sets a variable to a specified value.*/",
+        "getterMethodName" : "getSetVariable",
+        "getterModel" : {
+          "returnType" : "SetVariableAction",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "setVariable",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "setVariable",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "SetVariable",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@param setVariable Sets a variable to a specified value.*/",
+        "setterMethodName" : "setSetVariable",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "SetVariableAction",
+          "variableName" : "setVariable",
+          "variableType" : "SetVariableAction",
+          "documentation" : "",
+          "simpleType" : "SetVariableAction",
+          "variableSetterType" : "SetVariableAction"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@param setVariable Sets a variable to a specified value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "SetVariableAction",
+          "variableName" : "setVariable",
+          "variableType" : "SetVariableAction",
+          "documentation" : "<p>Sets a variable to a specified value.</p>",
+          "simpleType" : "SetVariableAction",
+          "variableSetterType" : "SetVariableAction"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "sns",
+        "c2jShape" : "SNSTopicPublishAction",
+        "deprecated" : false,
+        "documentation" : "<p>Sends an Amazon SNS message.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@param sns Sends an Amazon SNS message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSns",
+        "getterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@return Sends an Amazon SNS message.*/",
+        "getterMethodName" : "getSns",
+        "getterModel" : {
+          "returnType" : "SNSTopicPublishAction",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "sns",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "sns",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "Sns",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@param sns Sends an Amazon SNS message.*/",
+        "setterMethodName" : "setSns",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "SNSTopicPublishAction",
+          "variableName" : "sns",
+          "variableType" : "SNSTopicPublishAction",
+          "documentation" : "",
+          "simpleType" : "SNSTopicPublishAction",
+          "variableSetterType" : "SNSTopicPublishAction"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@param sns Sends an Amazon SNS message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "SNSTopicPublishAction",
+          "variableName" : "sns",
+          "variableType" : "SNSTopicPublishAction",
+          "documentation" : "<p>Sends an Amazon SNS message.</p>",
+          "simpleType" : "SNSTopicPublishAction",
+          "variableSetterType" : "SNSTopicPublishAction"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "iotTopicPublish",
+        "c2jShape" : "IotTopicPublishAction",
+        "deprecated" : false,
+        "documentation" : "<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@param iotTopicPublish Publishes an MQTT message with the given topic to the AWS IoT Message Broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIotTopicPublish",
+        "getterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@return Publishes an MQTT message with the given topic to the AWS IoT Message Broker.*/",
+        "getterMethodName" : "getIotTopicPublish",
+        "getterModel" : {
+          "returnType" : "IotTopicPublishAction",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "iotTopicPublish",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "iotTopicPublish",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "IotTopicPublish",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@param iotTopicPublish Publishes an MQTT message with the given topic to the AWS IoT Message Broker.*/",
+        "setterMethodName" : "setIotTopicPublish",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "IotTopicPublishAction",
+          "variableName" : "iotTopicPublish",
+          "variableType" : "IotTopicPublishAction",
+          "documentation" : "",
+          "simpleType" : "IotTopicPublishAction",
+          "variableSetterType" : "IotTopicPublishAction"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@param iotTopicPublish Publishes an MQTT message with the given topic to the AWS IoT Message Broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "IotTopicPublishAction",
+          "variableName" : "iotTopicPublish",
+          "variableType" : "IotTopicPublishAction",
+          "documentation" : "<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>",
+          "simpleType" : "IotTopicPublishAction",
+          "variableSetterType" : "IotTopicPublishAction"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "setTimer",
+        "c2jShape" : "SetTimerAction",
+        "deprecated" : false,
+        "documentation" : "<p>Information needed to set the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@param setTimer Information needed to set the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSetTimer",
+        "getterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@return Information needed to set the timer.*/",
+        "getterMethodName" : "getSetTimer",
+        "getterModel" : {
+          "returnType" : "SetTimerAction",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "setTimer",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "setTimer",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "SetTimer",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@param setTimer Information needed to set the timer.*/",
+        "setterMethodName" : "setSetTimer",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "SetTimerAction",
+          "variableName" : "setTimer",
+          "variableType" : "SetTimerAction",
+          "documentation" : "",
+          "simpleType" : "SetTimerAction",
+          "variableSetterType" : "SetTimerAction"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@param setTimer Information needed to set the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "SetTimerAction",
+          "variableName" : "setTimer",
+          "variableType" : "SetTimerAction",
+          "documentation" : "<p>Information needed to set the timer.</p>",
+          "simpleType" : "SetTimerAction",
+          "variableSetterType" : "SetTimerAction"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "clearTimer",
+        "c2jShape" : "ClearTimerAction",
+        "deprecated" : false,
+        "documentation" : "<p>Information needed to clear the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@param clearTimer Information needed to clear the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClearTimer",
+        "getterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@return Information needed to clear the timer.*/",
+        "getterMethodName" : "getClearTimer",
+        "getterModel" : {
+          "returnType" : "ClearTimerAction",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clearTimer",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clearTimer",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ClearTimer",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@param clearTimer Information needed to clear the timer.*/",
+        "setterMethodName" : "setClearTimer",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ClearTimerAction",
+          "variableName" : "clearTimer",
+          "variableType" : "ClearTimerAction",
+          "documentation" : "",
+          "simpleType" : "ClearTimerAction",
+          "variableSetterType" : "ClearTimerAction"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@param clearTimer Information needed to clear the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ClearTimerAction",
+          "variableName" : "clearTimer",
+          "variableType" : "ClearTimerAction",
+          "documentation" : "<p>Information needed to clear the timer.</p>",
+          "simpleType" : "ClearTimerAction",
+          "variableSetterType" : "ClearTimerAction"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "resetTimer",
+        "c2jShape" : "ResetTimerAction",
+        "deprecated" : false,
+        "documentation" : "<p>Information needed to reset the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@param resetTimer Information needed to reset the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResetTimer",
+        "getterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@return Information needed to reset the timer.*/",
+        "getterMethodName" : "getResetTimer",
+        "getterModel" : {
+          "returnType" : "ResetTimerAction",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resetTimer",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resetTimer",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ResetTimer",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@param resetTimer Information needed to reset the timer.*/",
+        "setterMethodName" : "setResetTimer",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ResetTimerAction",
+          "variableName" : "resetTimer",
+          "variableType" : "ResetTimerAction",
+          "documentation" : "",
+          "simpleType" : "ResetTimerAction",
+          "variableSetterType" : "ResetTimerAction"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@param resetTimer Information needed to reset the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ResetTimerAction",
+          "variableName" : "resetTimer",
+          "variableType" : "ResetTimerAction",
+          "documentation" : "<p>Information needed to reset the timer.</p>",
+          "simpleType" : "ResetTimerAction",
+          "variableSetterType" : "ResetTimerAction"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClearTimer" : {
+          "c2jName" : "clearTimer",
+          "c2jShape" : "ClearTimerAction",
+          "deprecated" : false,
+          "documentation" : "<p>Information needed to clear the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@param clearTimer Information needed to clear the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClearTimer",
+          "getterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@return Information needed to clear the timer.*/",
+          "getterMethodName" : "getClearTimer",
+          "getterModel" : {
+            "returnType" : "ClearTimerAction",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clearTimer",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clearTimer",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ClearTimer",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@param clearTimer Information needed to clear the timer.*/",
+          "setterMethodName" : "setClearTimer",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ClearTimerAction",
+            "variableName" : "clearTimer",
+            "variableType" : "ClearTimerAction",
+            "documentation" : "",
+            "simpleType" : "ClearTimerAction",
+            "variableSetterType" : "ClearTimerAction"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information needed to clear the timer.</p>\n@param clearTimer Information needed to clear the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ClearTimerAction",
+            "variableName" : "clearTimer",
+            "variableType" : "ClearTimerAction",
+            "documentation" : "<p>Information needed to clear the timer.</p>",
+            "simpleType" : "ClearTimerAction",
+            "variableSetterType" : "ClearTimerAction"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "IotTopicPublish" : {
+          "c2jName" : "iotTopicPublish",
+          "c2jShape" : "IotTopicPublishAction",
+          "deprecated" : false,
+          "documentation" : "<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@param iotTopicPublish Publishes an MQTT message with the given topic to the AWS IoT Message Broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIotTopicPublish",
+          "getterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@return Publishes an MQTT message with the given topic to the AWS IoT Message Broker.*/",
+          "getterMethodName" : "getIotTopicPublish",
+          "getterModel" : {
+            "returnType" : "IotTopicPublishAction",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "iotTopicPublish",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "iotTopicPublish",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "IotTopicPublish",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@param iotTopicPublish Publishes an MQTT message with the given topic to the AWS IoT Message Broker.*/",
+          "setterMethodName" : "setIotTopicPublish",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "IotTopicPublishAction",
+            "variableName" : "iotTopicPublish",
+            "variableType" : "IotTopicPublishAction",
+            "documentation" : "",
+            "simpleType" : "IotTopicPublishAction",
+            "variableSetterType" : "IotTopicPublishAction"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>\n@param iotTopicPublish Publishes an MQTT message with the given topic to the AWS IoT Message Broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "IotTopicPublishAction",
+            "variableName" : "iotTopicPublish",
+            "variableType" : "IotTopicPublishAction",
+            "documentation" : "<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>",
+            "simpleType" : "IotTopicPublishAction",
+            "variableSetterType" : "IotTopicPublishAction"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResetTimer" : {
+          "c2jName" : "resetTimer",
+          "c2jShape" : "ResetTimerAction",
+          "deprecated" : false,
+          "documentation" : "<p>Information needed to reset the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@param resetTimer Information needed to reset the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResetTimer",
+          "getterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@return Information needed to reset the timer.*/",
+          "getterMethodName" : "getResetTimer",
+          "getterModel" : {
+            "returnType" : "ResetTimerAction",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resetTimer",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resetTimer",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ResetTimer",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@param resetTimer Information needed to reset the timer.*/",
+          "setterMethodName" : "setResetTimer",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ResetTimerAction",
+            "variableName" : "resetTimer",
+            "variableType" : "ResetTimerAction",
+            "documentation" : "",
+            "simpleType" : "ResetTimerAction",
+            "variableSetterType" : "ResetTimerAction"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information needed to reset the timer.</p>\n@param resetTimer Information needed to reset the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ResetTimerAction",
+            "variableName" : "resetTimer",
+            "variableType" : "ResetTimerAction",
+            "documentation" : "<p>Information needed to reset the timer.</p>",
+            "simpleType" : "ResetTimerAction",
+            "variableSetterType" : "ResetTimerAction"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SetTimer" : {
+          "c2jName" : "setTimer",
+          "c2jShape" : "SetTimerAction",
+          "deprecated" : false,
+          "documentation" : "<p>Information needed to set the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@param setTimer Information needed to set the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSetTimer",
+          "getterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@return Information needed to set the timer.*/",
+          "getterMethodName" : "getSetTimer",
+          "getterModel" : {
+            "returnType" : "SetTimerAction",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "setTimer",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "setTimer",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "SetTimer",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@param setTimer Information needed to set the timer.*/",
+          "setterMethodName" : "setSetTimer",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "SetTimerAction",
+            "variableName" : "setTimer",
+            "variableType" : "SetTimerAction",
+            "documentation" : "",
+            "simpleType" : "SetTimerAction",
+            "variableSetterType" : "SetTimerAction"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information needed to set the timer.</p>\n@param setTimer Information needed to set the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "SetTimerAction",
+            "variableName" : "setTimer",
+            "variableType" : "SetTimerAction",
+            "documentation" : "<p>Information needed to set the timer.</p>",
+            "simpleType" : "SetTimerAction",
+            "variableSetterType" : "SetTimerAction"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SetVariable" : {
+          "c2jName" : "setVariable",
+          "c2jShape" : "SetVariableAction",
+          "deprecated" : false,
+          "documentation" : "<p>Sets a variable to a specified value.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@param setVariable Sets a variable to a specified value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSetVariable",
+          "getterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@return Sets a variable to a specified value.*/",
+          "getterMethodName" : "getSetVariable",
+          "getterModel" : {
+            "returnType" : "SetVariableAction",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "setVariable",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "setVariable",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "SetVariable",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@param setVariable Sets a variable to a specified value.*/",
+          "setterMethodName" : "setSetVariable",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "SetVariableAction",
+            "variableName" : "setVariable",
+            "variableType" : "SetVariableAction",
+            "documentation" : "",
+            "simpleType" : "SetVariableAction",
+            "variableSetterType" : "SetVariableAction"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Sets a variable to a specified value.</p>\n@param setVariable Sets a variable to a specified value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "SetVariableAction",
+            "variableName" : "setVariable",
+            "variableType" : "SetVariableAction",
+            "documentation" : "<p>Sets a variable to a specified value.</p>",
+            "simpleType" : "SetVariableAction",
+            "variableSetterType" : "SetVariableAction"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Sns" : {
+          "c2jName" : "sns",
+          "c2jShape" : "SNSTopicPublishAction",
+          "deprecated" : false,
+          "documentation" : "<p>Sends an Amazon SNS message.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@param sns Sends an Amazon SNS message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSns",
+          "getterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@return Sends an Amazon SNS message.*/",
+          "getterMethodName" : "getSns",
+          "getterModel" : {
+            "returnType" : "SNSTopicPublishAction",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sns",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sns",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "Sns",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@param sns Sends an Amazon SNS message.*/",
+          "setterMethodName" : "setSns",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "SNSTopicPublishAction",
+            "variableName" : "sns",
+            "variableType" : "SNSTopicPublishAction",
+            "documentation" : "",
+            "simpleType" : "SNSTopicPublishAction",
+            "variableSetterType" : "SNSTopicPublishAction"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Sends an Amazon SNS message.</p>\n@param sns Sends an Amazon SNS message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "SNSTopicPublishAction",
+            "variableName" : "sns",
+            "variableType" : "SNSTopicPublishAction",
+            "documentation" : "<p>Sends an Amazon SNS message.</p>",
+            "simpleType" : "SNSTopicPublishAction",
+            "variableSetterType" : "SNSTopicPublishAction"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "Action",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Action",
+        "variableName" : "action",
+        "variableType" : "Action",
+        "documentation" : null,
+        "simpleType" : "Action",
+        "variableSetterType" : "Action"
+      },
+      "wrapper" : false
+    },
+    "Attribute" : {
+      "c2jName" : "Attribute",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here are available for use in the <code>condition</code> expressions used by detectors. </p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "jsonPath",
+        "c2jShape" : "AttributeJsonPath",
+        "deprecated" : false,
+        "documentation" : "<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@param jsonPath An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withJsonPath",
+        "getterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@return An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>*/",
+        "getterMethodName" : "getJsonPath",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "jsonPath",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "jsonPath",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "JsonPath",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@param jsonPath An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>*/",
+        "setterMethodName" : "setJsonPath",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "jsonPath",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@param jsonPath An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "jsonPath",
+          "variableType" : "String",
+          "documentation" : "<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "JsonPath" : {
+          "c2jName" : "jsonPath",
+          "c2jShape" : "AttributeJsonPath",
+          "deprecated" : false,
+          "documentation" : "<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@param jsonPath An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withJsonPath",
+          "getterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@return An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>*/",
+          "getterMethodName" : "getJsonPath",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "jsonPath",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "jsonPath",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "JsonPath",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@param jsonPath An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>*/",
+          "setterMethodName" : "setJsonPath",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "jsonPath",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>\n@param jsonPath An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "jsonPath",
+            "variableType" : "String",
+            "documentation" : "<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "jsonPath" ],
+      "shapeName" : "Attribute",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Attribute",
+        "variableName" : "attribute",
+        "variableType" : "Attribute",
+        "documentation" : null,
+        "simpleType" : "Attribute",
+        "variableSetterType" : "Attribute"
+      },
+      "wrapper" : false
+    },
+    "ClearTimerAction" : {
+      "c2jName" : "ClearTimerAction",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information needed to clear the timer.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "timerName",
+        "c2jShape" : "TimerName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the timer to clear.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@param timerName The name of the timer to clear.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTimerName",
+        "getterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@return The name of the timer to clear.*/",
+        "getterMethodName" : "getTimerName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "timerName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "timerName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TimerName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@param timerName The name of the timer to clear.*/",
+        "setterMethodName" : "setTimerName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "timerName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@param timerName The name of the timer to clear.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "timerName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the timer to clear.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "TimerName" : {
+          "c2jName" : "timerName",
+          "c2jShape" : "TimerName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the timer to clear.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@param timerName The name of the timer to clear.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTimerName",
+          "getterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@return The name of the timer to clear.*/",
+          "getterMethodName" : "getTimerName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "timerName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "timerName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TimerName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@param timerName The name of the timer to clear.*/",
+          "setterMethodName" : "setTimerName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "timerName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the timer to clear.</p>\n@param timerName The name of the timer to clear.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "timerName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the timer to clear.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "timerName" ],
+      "shapeName" : "ClearTimerAction",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ClearTimerAction",
+        "variableName" : "clearTimerAction",
+        "variableType" : "ClearTimerAction",
+        "documentation" : null,
+        "simpleType" : "ClearTimerAction",
+        "variableSetterType" : "ClearTimerAction"
+      },
+      "wrapper" : false
+    },
+    "CreateDetectorModelRequest" : {
+      "c2jName" : "CreateDetectorModelRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "CreateDetectorModel",
+        "locationName" : null,
+        "requestUri" : "/detector-models",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelDefinition",
+        "c2jShape" : "DetectorModelDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>Information that defines how the detectors operate.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@param detectorModelDefinition Information that defines how the detectors operate.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDefinition",
+        "getterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@return Information that defines how the detectors operate.*/",
+        "getterMethodName" : "getDetectorModelDefinition",
+        "getterModel" : {
+          "returnType" : "DetectorModelDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDefinition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDefinition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModelDefinition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@param detectorModelDefinition Information that defines how the detectors operate.*/",
+        "setterMethodName" : "setDetectorModelDefinition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelDefinition",
+          "variableName" : "detectorModelDefinition",
+          "variableType" : "DetectorModelDefinition",
+          "documentation" : "",
+          "simpleType" : "DetectorModelDefinition",
+          "variableSetterType" : "DetectorModelDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@param detectorModelDefinition Information that defines how the detectors operate.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelDefinition",
+          "variableName" : "detectorModelDefinition",
+          "variableType" : "DetectorModelDefinition",
+          "documentation" : "<p>Information that defines how the detectors operate.</p>",
+          "simpleType" : "DetectorModelDefinition",
+          "variableSetterType" : "DetectorModelDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelDescription",
+        "c2jShape" : "DetectorModelDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDescription",
+        "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+        "getterMethodName" : "getDetectorModelDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+        "setterMethodName" : "setDetectorModelDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "key",
+        "c2jShape" : "AttributeJsonPath",
+        "deprecated" : false,
+        "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKey",
+        "getterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@return The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+        "getterMethodName" : "getKey",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "key",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "key",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Key",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+        "setterMethodName" : "setKey",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "key",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "key",
+          "variableType" : "String",
+          "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tags",
+        "c2jShape" : "Tags",
+        "deprecated" : false,
+        "documentation" : "<p>Metadata which can be used to manage the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n@param tags Metadata which can be used to manage the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n@return Metadata which can be used to manage the detector model.*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.List<Tag>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Tag",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Tag",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Tag",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Tag",
+          "templateImplType" : "java.util.ArrayList<Tag>",
+          "templateType" : "java.util.List<Tag>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n@param tags Metadata which can be used to manage the detector model.*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags Metadata which can be used to manage the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "<p>Metadata which can be used to manage the detector model.</p>",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelDefinition" : {
+          "c2jName" : "detectorModelDefinition",
+          "c2jShape" : "DetectorModelDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>Information that defines how the detectors operate.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@param detectorModelDefinition Information that defines how the detectors operate.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDefinition",
+          "getterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@return Information that defines how the detectors operate.*/",
+          "getterMethodName" : "getDetectorModelDefinition",
+          "getterModel" : {
+            "returnType" : "DetectorModelDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDefinition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDefinition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModelDefinition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@param detectorModelDefinition Information that defines how the detectors operate.*/",
+          "setterMethodName" : "setDetectorModelDefinition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelDefinition",
+            "variableName" : "detectorModelDefinition",
+            "variableType" : "DetectorModelDefinition",
+            "documentation" : "",
+            "simpleType" : "DetectorModelDefinition",
+            "variableSetterType" : "DetectorModelDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information that defines how the detectors operate.</p>\n@param detectorModelDefinition Information that defines how the detectors operate.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelDefinition",
+            "variableName" : "detectorModelDefinition",
+            "variableType" : "DetectorModelDefinition",
+            "documentation" : "<p>Information that defines how the detectors operate.</p>",
+            "simpleType" : "DetectorModelDefinition",
+            "variableSetterType" : "DetectorModelDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelDescription" : {
+          "c2jName" : "detectorModelDescription",
+          "c2jShape" : "DetectorModelDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDescription",
+          "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+          "getterMethodName" : "getDetectorModelDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+          "setterMethodName" : "setDetectorModelDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Key" : {
+          "c2jName" : "key",
+          "c2jShape" : "AttributeJsonPath",
+          "deprecated" : false,
+          "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKey",
+          "getterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@return The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+          "getterMethodName" : "getKey",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "key",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "key",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Key",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+          "setterMethodName" : "setKey",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "key",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "key",
+            "variableType" : "String",
+            "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "Tags",
+          "deprecated" : false,
+          "documentation" : "<p>Metadata which can be used to manage the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n@param tags Metadata which can be used to manage the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n@return Metadata which can be used to manage the detector model.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.List<Tag>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Tag",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Tag",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Tag",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Tag",
+            "templateImplType" : "java.util.ArrayList<Tag>",
+            "templateType" : "java.util.List<Tag>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n@param tags Metadata which can be used to manage the detector model.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Metadata which can be used to manage the detector model.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags Metadata which can be used to manage the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "<p>Metadata which can be used to manage the detector model.</p>",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName", "detectorModelDefinition", "roleArn" ],
+      "shapeName" : "CreateDetectorModelRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreateDetectorModelRequest",
+        "variableName" : "createDetectorModelRequest",
+        "variableType" : "CreateDetectorModelRequest",
+        "documentation" : null,
+        "simpleType" : "CreateDetectorModelRequest",
+        "variableSetterType" : "CreateDetectorModelRequest"
+      },
+      "wrapper" : false
+    },
+    "CreateDetectorModelResult" : {
+      "c2jName" : "CreateDetectorModelResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelConfiguration",
+        "c2jShape" : "DetectorModelConfiguration",
+        "deprecated" : false,
+        "documentation" : "<p>Information about how the detector model is configured.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelConfiguration",
+        "getterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@return Information about how the detector model is configured.*/",
+        "getterMethodName" : "getDetectorModelConfiguration",
+        "getterModel" : {
+          "returnType" : "DetectorModelConfiguration",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelConfiguration",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelConfiguration",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModelConfiguration",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.*/",
+        "setterMethodName" : "setDetectorModelConfiguration",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelConfiguration",
+          "variableName" : "detectorModelConfiguration",
+          "variableType" : "DetectorModelConfiguration",
+          "documentation" : "",
+          "simpleType" : "DetectorModelConfiguration",
+          "variableSetterType" : "DetectorModelConfiguration"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelConfiguration",
+          "variableName" : "detectorModelConfiguration",
+          "variableType" : "DetectorModelConfiguration",
+          "documentation" : "<p>Information about how the detector model is configured.</p>",
+          "simpleType" : "DetectorModelConfiguration",
+          "variableSetterType" : "DetectorModelConfiguration"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelConfiguration" : {
+          "c2jName" : "detectorModelConfiguration",
+          "c2jShape" : "DetectorModelConfiguration",
+          "deprecated" : false,
+          "documentation" : "<p>Information about how the detector model is configured.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelConfiguration",
+          "getterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@return Information about how the detector model is configured.*/",
+          "getterMethodName" : "getDetectorModelConfiguration",
+          "getterModel" : {
+            "returnType" : "DetectorModelConfiguration",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelConfiguration",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelConfiguration",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModelConfiguration",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.*/",
+          "setterMethodName" : "setDetectorModelConfiguration",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelConfiguration",
+            "variableName" : "detectorModelConfiguration",
+            "variableType" : "DetectorModelConfiguration",
+            "documentation" : "",
+            "simpleType" : "DetectorModelConfiguration",
+            "variableSetterType" : "DetectorModelConfiguration"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelConfiguration",
+            "variableName" : "detectorModelConfiguration",
+            "variableType" : "DetectorModelConfiguration",
+            "documentation" : "<p>Information about how the detector model is configured.</p>",
+            "simpleType" : "DetectorModelConfiguration",
+            "variableSetterType" : "DetectorModelConfiguration"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "CreateDetectorModelResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreateDetectorModelResult",
+        "variableName" : "createDetectorModelResult",
+        "variableType" : "CreateDetectorModelResult",
+        "documentation" : null,
+        "simpleType" : "CreateDetectorModelResult",
+        "variableSetterType" : "CreateDetectorModelResult"
+      },
+      "wrapper" : false
+    },
+    "CreateInputRequest" : {
+      "c2jName" : "CreateInputRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "CreateInput",
+        "locationName" : null,
+        "requestUri" : "/inputs",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name you want to give to the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@param inputName The name you want to give to the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@return The name you want to give to the input.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@param inputName The name you want to give to the input.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@param inputName The name you want to give to the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name you want to give to the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDescription",
+        "c2jShape" : "InputDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDescription",
+        "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+        "getterMethodName" : "getInputDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+        "setterMethodName" : "setInputDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDefinition",
+        "c2jShape" : "InputDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>The definition of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDefinition",
+        "getterDocumentation" : "/**<p>The definition of the input.</p>\n@return The definition of the input.*/",
+        "getterMethodName" : "getInputDefinition",
+        "getterModel" : {
+          "returnType" : "InputDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDefinition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDefinition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "InputDefinition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.*/",
+        "setterMethodName" : "setInputDefinition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputDefinition",
+          "variableName" : "inputDefinition",
+          "variableType" : "InputDefinition",
+          "documentation" : "",
+          "simpleType" : "InputDefinition",
+          "variableSetterType" : "InputDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputDefinition",
+          "variableName" : "inputDefinition",
+          "variableType" : "InputDefinition",
+          "documentation" : "<p>The definition of the input.</p>",
+          "simpleType" : "InputDefinition",
+          "variableSetterType" : "InputDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tags",
+        "c2jShape" : "Tags",
+        "deprecated" : false,
+        "documentation" : "<p>Metadata which can be used to manage the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n@param tags Metadata which can be used to manage the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n@return Metadata which can be used to manage the input.*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.List<Tag>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Tag",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Tag",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Tag",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Tag",
+          "templateImplType" : "java.util.ArrayList<Tag>",
+          "templateType" : "java.util.List<Tag>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n@param tags Metadata which can be used to manage the input.*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags Metadata which can be used to manage the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "<p>Metadata which can be used to manage the input.</p>",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputDefinition" : {
+          "c2jName" : "inputDefinition",
+          "c2jShape" : "InputDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>The definition of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDefinition",
+          "getterDocumentation" : "/**<p>The definition of the input.</p>\n@return The definition of the input.*/",
+          "getterMethodName" : "getInputDefinition",
+          "getterModel" : {
+            "returnType" : "InputDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDefinition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDefinition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "InputDefinition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.*/",
+          "setterMethodName" : "setInputDefinition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputDefinition",
+            "variableName" : "inputDefinition",
+            "variableType" : "InputDefinition",
+            "documentation" : "",
+            "simpleType" : "InputDefinition",
+            "variableSetterType" : "InputDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputDefinition",
+            "variableName" : "inputDefinition",
+            "variableType" : "InputDefinition",
+            "documentation" : "<p>The definition of the input.</p>",
+            "simpleType" : "InputDefinition",
+            "variableSetterType" : "InputDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputDescription" : {
+          "c2jName" : "inputDescription",
+          "c2jShape" : "InputDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDescription",
+          "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+          "getterMethodName" : "getInputDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+          "setterMethodName" : "setInputDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name you want to give to the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@param inputName The name you want to give to the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@return The name you want to give to the input.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@param inputName The name you want to give to the input.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name you want to give to the input.</p>\n@param inputName The name you want to give to the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name you want to give to the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "Tags",
+          "deprecated" : false,
+          "documentation" : "<p>Metadata which can be used to manage the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n@param tags Metadata which can be used to manage the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n@return Metadata which can be used to manage the input.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.List<Tag>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Tag",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Tag",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Tag",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Tag",
+            "templateImplType" : "java.util.ArrayList<Tag>",
+            "templateType" : "java.util.List<Tag>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n@param tags Metadata which can be used to manage the input.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Metadata which can be used to manage the input.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags Metadata which can be used to manage the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "<p>Metadata which can be used to manage the input.</p>",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "inputName", "inputDefinition" ],
+      "shapeName" : "CreateInputRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreateInputRequest",
+        "variableName" : "createInputRequest",
+        "variableType" : "CreateInputRequest",
+        "documentation" : null,
+        "simpleType" : "CreateInputRequest",
+        "variableSetterType" : "CreateInputRequest"
+      },
+      "wrapper" : false
+    },
+    "CreateInputResult" : {
+      "c2jName" : "CreateInputResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "inputConfiguration",
+        "c2jShape" : "InputConfiguration",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the configuration of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputConfiguration",
+        "getterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@return Information about the configuration of the input.*/",
+        "getterMethodName" : "getInputConfiguration",
+        "getterModel" : {
+          "returnType" : "InputConfiguration",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputConfiguration",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputConfiguration",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "InputConfiguration",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.*/",
+        "setterMethodName" : "setInputConfiguration",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputConfiguration",
+          "variableName" : "inputConfiguration",
+          "variableType" : "InputConfiguration",
+          "documentation" : "",
+          "simpleType" : "InputConfiguration",
+          "variableSetterType" : "InputConfiguration"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputConfiguration",
+          "variableName" : "inputConfiguration",
+          "variableType" : "InputConfiguration",
+          "documentation" : "<p>Information about the configuration of the input.</p>",
+          "simpleType" : "InputConfiguration",
+          "variableSetterType" : "InputConfiguration"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputConfiguration" : {
+          "c2jName" : "inputConfiguration",
+          "c2jShape" : "InputConfiguration",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the configuration of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputConfiguration",
+          "getterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@return Information about the configuration of the input.*/",
+          "getterMethodName" : "getInputConfiguration",
+          "getterModel" : {
+            "returnType" : "InputConfiguration",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputConfiguration",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputConfiguration",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "InputConfiguration",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.*/",
+          "setterMethodName" : "setInputConfiguration",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputConfiguration",
+            "variableName" : "inputConfiguration",
+            "variableType" : "InputConfiguration",
+            "documentation" : "",
+            "simpleType" : "InputConfiguration",
+            "variableSetterType" : "InputConfiguration"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputConfiguration",
+            "variableName" : "inputConfiguration",
+            "variableType" : "InputConfiguration",
+            "documentation" : "<p>Information about the configuration of the input.</p>",
+            "simpleType" : "InputConfiguration",
+            "variableSetterType" : "InputConfiguration"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "CreateInputResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CreateInputResult",
+        "variableName" : "createInputResult",
+        "variableType" : "CreateInputResult",
+        "documentation" : null,
+        "simpleType" : "CreateInputResult",
+        "variableSetterType" : "CreateInputResult"
+      },
+      "wrapper" : false
+    },
+    "DeleteDetectorModelRequest" : {
+      "c2jName" : "DeleteDetectorModelRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DeleteDetectorModel",
+        "locationName" : null,
+        "requestUri" : "/detector-models/{detectorModelName}",
+        "target" : null,
+        "verb" : "DELETE",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model to be deleted.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@param detectorModelName The name of the detector model to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@return The name of the detector model to be deleted.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@param detectorModelName The name of the detector model to be deleted.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@param detectorModelName The name of the detector model to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model to be deleted.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model to be deleted.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@param detectorModelName The name of the detector model to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@return The name of the detector model to be deleted.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@param detectorModelName The name of the detector model to be deleted.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model to be deleted.</p>\n@param detectorModelName The name of the detector model to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model to be deleted.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName" ],
+      "shapeName" : "DeleteDetectorModelRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteDetectorModelRequest",
+        "variableName" : "deleteDetectorModelRequest",
+        "variableType" : "DeleteDetectorModelRequest",
+        "documentation" : null,
+        "simpleType" : "DeleteDetectorModelRequest",
+        "variableSetterType" : "DeleteDetectorModelRequest"
+      },
+      "wrapper" : false
+    },
+    "DeleteDetectorModelResult" : {
+      "c2jName" : "DeleteDetectorModelResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DeleteDetectorModelResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteDetectorModelResult",
+        "variableName" : "deleteDetectorModelResult",
+        "variableType" : "DeleteDetectorModelResult",
+        "documentation" : null,
+        "simpleType" : "DeleteDetectorModelResult",
+        "variableSetterType" : "DeleteDetectorModelResult"
+      },
+      "wrapper" : false
+    },
+    "DeleteInputRequest" : {
+      "c2jName" : "DeleteInputRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DeleteInput",
+        "locationName" : null,
+        "requestUri" : "/inputs/{inputName}",
+        "target" : null,
+        "verb" : "DELETE",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the input to be deleted.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@param inputName The name of the input to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@return The name of the input to be deleted.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@param inputName The name of the input to be deleted.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@param inputName The name of the input to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the input to be deleted.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the input to be deleted.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@param inputName The name of the input to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@return The name of the input to be deleted.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@param inputName The name of the input to be deleted.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the input to be deleted.</p>\n@param inputName The name of the input to be deleted.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the input to be deleted.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "inputName" ],
+      "shapeName" : "DeleteInputRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteInputRequest",
+        "variableName" : "deleteInputRequest",
+        "variableType" : "DeleteInputRequest",
+        "documentation" : null,
+        "simpleType" : "DeleteInputRequest",
+        "variableSetterType" : "DeleteInputRequest"
+      },
+      "wrapper" : false
+    },
+    "DeleteInputResult" : {
+      "c2jName" : "DeleteInputResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DeleteInputResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteInputResult",
+        "variableName" : "deleteInputResult",
+        "variableType" : "DeleteInputResult",
+        "documentation" : null,
+        "simpleType" : "DeleteInputResult",
+        "variableSetterType" : "DeleteInputResult"
+      },
+      "wrapper" : false
+    },
+    "DescribeDetectorModelRequest" : {
+      "c2jName" : "DescribeDetectorModelRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DescribeDetectorModel",
+        "locationName" : null,
+        "requestUri" : "/detector-models/{detectorModelName}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelVersion",
+        "c2jShape" : "DetectorModelVersion",
+        "deprecated" : false,
+        "documentation" : "<p>The version of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelVersion",
+        "getterDocumentation" : "/**<p>The version of the detector model.</p>\n@return The version of the detector model.*/",
+        "getterMethodName" : "getDetectorModelVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "version",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "version",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.*/",
+        "setterMethodName" : "setDetectorModelVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "<p>The version of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelVersion" : {
+          "c2jName" : "detectorModelVersion",
+          "c2jShape" : "DetectorModelVersion",
+          "deprecated" : false,
+          "documentation" : "<p>The version of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelVersion",
+          "getterDocumentation" : "/**<p>The version of the detector model.</p>\n@return The version of the detector model.*/",
+          "getterMethodName" : "getDetectorModelVersion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "version",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "version",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.*/",
+          "setterMethodName" : "setDetectorModelVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "<p>The version of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName" ],
+      "shapeName" : "DescribeDetectorModelRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeDetectorModelRequest",
+        "variableName" : "describeDetectorModelRequest",
+        "variableType" : "DescribeDetectorModelRequest",
+        "documentation" : null,
+        "simpleType" : "DescribeDetectorModelRequest",
+        "variableSetterType" : "DescribeDetectorModelRequest"
+      },
+      "wrapper" : false
+    },
+    "DescribeDetectorModelResult" : {
+      "c2jName" : "DescribeDetectorModelResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModel",
+        "c2jShape" : "DetectorModel",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the detector model.</p>\n@param detectorModel Information about the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModel",
+        "getterDocumentation" : "/**<p>Information about the detector model.</p>\n@return Information about the detector model.*/",
+        "getterMethodName" : "getDetectorModel",
+        "getterModel" : {
+          "returnType" : "DetectorModel",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModel",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModel",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModel",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the detector model.</p>\n@param detectorModel Information about the detector model.*/",
+        "setterMethodName" : "setDetectorModel",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModel",
+          "variableName" : "detectorModel",
+          "variableType" : "DetectorModel",
+          "documentation" : "",
+          "simpleType" : "DetectorModel",
+          "variableSetterType" : "DetectorModel"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the detector model.</p>\n@param detectorModel Information about the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModel",
+          "variableName" : "detectorModel",
+          "variableType" : "DetectorModel",
+          "documentation" : "<p>Information about the detector model.</p>",
+          "simpleType" : "DetectorModel",
+          "variableSetterType" : "DetectorModel"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModel" : {
+          "c2jName" : "detectorModel",
+          "c2jShape" : "DetectorModel",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the detector model.</p>\n@param detectorModel Information about the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModel",
+          "getterDocumentation" : "/**<p>Information about the detector model.</p>\n@return Information about the detector model.*/",
+          "getterMethodName" : "getDetectorModel",
+          "getterModel" : {
+            "returnType" : "DetectorModel",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModel",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModel",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModel",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the detector model.</p>\n@param detectorModel Information about the detector model.*/",
+          "setterMethodName" : "setDetectorModel",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModel",
+            "variableName" : "detectorModel",
+            "variableType" : "DetectorModel",
+            "documentation" : "",
+            "simpleType" : "DetectorModel",
+            "variableSetterType" : "DetectorModel"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the detector model.</p>\n@param detectorModel Information about the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModel",
+            "variableName" : "detectorModel",
+            "variableType" : "DetectorModel",
+            "documentation" : "<p>Information about the detector model.</p>",
+            "simpleType" : "DetectorModel",
+            "variableSetterType" : "DetectorModel"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DescribeDetectorModelResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeDetectorModelResult",
+        "variableName" : "describeDetectorModelResult",
+        "variableType" : "DescribeDetectorModelResult",
+        "documentation" : null,
+        "simpleType" : "DescribeDetectorModelResult",
+        "variableSetterType" : "DescribeDetectorModelResult"
+      },
+      "wrapper" : false
+    },
+    "DescribeInputRequest" : {
+      "c2jName" : "DescribeInputRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DescribeInput",
+        "locationName" : null,
+        "requestUri" : "/inputs/{inputName}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name of the input.</p>\n@return The name of the input.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name of the input.</p>\n@return The name of the input.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "inputName" ],
+      "shapeName" : "DescribeInputRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeInputRequest",
+        "variableName" : "describeInputRequest",
+        "variableType" : "DescribeInputRequest",
+        "documentation" : null,
+        "simpleType" : "DescribeInputRequest",
+        "variableSetterType" : "DescribeInputRequest"
+      },
+      "wrapper" : false
+    },
+    "DescribeInputResult" : {
+      "c2jName" : "DescribeInputResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "input",
+        "c2jShape" : "Input",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the input.</p>\n@param input Information about the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInput",
+        "getterDocumentation" : "/**<p>Information about the input.</p>\n@return Information about the input.*/",
+        "getterMethodName" : "getInput",
+        "getterModel" : {
+          "returnType" : "Input",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "input",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "input",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "Input",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the input.</p>\n@param input Information about the input.*/",
+        "setterMethodName" : "setInput",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Input",
+          "variableName" : "input",
+          "variableType" : "Input",
+          "documentation" : "",
+          "simpleType" : "Input",
+          "variableSetterType" : "Input"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the input.</p>\n@param input Information about the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Input",
+          "variableName" : "input",
+          "variableType" : "Input",
+          "documentation" : "<p>Information about the input.</p>",
+          "simpleType" : "Input",
+          "variableSetterType" : "Input"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Input" : {
+          "c2jName" : "input",
+          "c2jShape" : "Input",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the input.</p>\n@param input Information about the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInput",
+          "getterDocumentation" : "/**<p>Information about the input.</p>\n@return Information about the input.*/",
+          "getterMethodName" : "getInput",
+          "getterModel" : {
+            "returnType" : "Input",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "input",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "input",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "Input",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the input.</p>\n@param input Information about the input.*/",
+          "setterMethodName" : "setInput",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Input",
+            "variableName" : "input",
+            "variableType" : "Input",
+            "documentation" : "",
+            "simpleType" : "Input",
+            "variableSetterType" : "Input"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the input.</p>\n@param input Information about the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Input",
+            "variableName" : "input",
+            "variableType" : "Input",
+            "documentation" : "<p>Information about the input.</p>",
+            "simpleType" : "Input",
+            "variableSetterType" : "Input"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DescribeInputResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeInputResult",
+        "variableName" : "describeInputResult",
+        "variableType" : "DescribeInputResult",
+        "documentation" : null,
+        "simpleType" : "DescribeInputResult",
+        "variableSetterType" : "DescribeInputResult"
+      },
+      "wrapper" : false
+    },
+    "DescribeLoggingOptionsRequest" : {
+      "c2jName" : "DescribeLoggingOptionsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DescribeLoggingOptions",
+        "locationName" : null,
+        "requestUri" : "/logging",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DescribeLoggingOptionsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeLoggingOptionsRequest",
+        "variableName" : "describeLoggingOptionsRequest",
+        "variableType" : "DescribeLoggingOptionsRequest",
+        "documentation" : null,
+        "simpleType" : "DescribeLoggingOptionsRequest",
+        "variableSetterType" : "DescribeLoggingOptionsRequest"
+      },
+      "wrapper" : false
+    },
+    "DescribeLoggingOptionsResult" : {
+      "c2jName" : "DescribeLoggingOptionsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "loggingOptions",
+        "c2jShape" : "LoggingOptions",
+        "deprecated" : false,
+        "documentation" : "<p>The current settings of the AWS IoT Events logging options.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@param loggingOptions The current settings of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLoggingOptions",
+        "getterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@return The current settings of the AWS IoT Events logging options.*/",
+        "getterMethodName" : "getLoggingOptions",
+        "getterModel" : {
+          "returnType" : "LoggingOptions",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "loggingOptions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "loggingOptions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "LoggingOptions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@param loggingOptions The current settings of the AWS IoT Events logging options.*/",
+        "setterMethodName" : "setLoggingOptions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "LoggingOptions",
+          "variableName" : "loggingOptions",
+          "variableType" : "LoggingOptions",
+          "documentation" : "",
+          "simpleType" : "LoggingOptions",
+          "variableSetterType" : "LoggingOptions"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@param loggingOptions The current settings of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "LoggingOptions",
+          "variableName" : "loggingOptions",
+          "variableType" : "LoggingOptions",
+          "documentation" : "<p>The current settings of the AWS IoT Events logging options.</p>",
+          "simpleType" : "LoggingOptions",
+          "variableSetterType" : "LoggingOptions"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "LoggingOptions" : {
+          "c2jName" : "loggingOptions",
+          "c2jShape" : "LoggingOptions",
+          "deprecated" : false,
+          "documentation" : "<p>The current settings of the AWS IoT Events logging options.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@param loggingOptions The current settings of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLoggingOptions",
+          "getterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@return The current settings of the AWS IoT Events logging options.*/",
+          "getterMethodName" : "getLoggingOptions",
+          "getterModel" : {
+            "returnType" : "LoggingOptions",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "loggingOptions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "loggingOptions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "LoggingOptions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@param loggingOptions The current settings of the AWS IoT Events logging options.*/",
+          "setterMethodName" : "setLoggingOptions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "LoggingOptions",
+            "variableName" : "loggingOptions",
+            "variableType" : "LoggingOptions",
+            "documentation" : "",
+            "simpleType" : "LoggingOptions",
+            "variableSetterType" : "LoggingOptions"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The current settings of the AWS IoT Events logging options.</p>\n@param loggingOptions The current settings of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "LoggingOptions",
+            "variableName" : "loggingOptions",
+            "variableType" : "LoggingOptions",
+            "documentation" : "<p>The current settings of the AWS IoT Events logging options.</p>",
+            "simpleType" : "LoggingOptions",
+            "variableSetterType" : "LoggingOptions"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DescribeLoggingOptionsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeLoggingOptionsResult",
+        "variableName" : "describeLoggingOptionsResult",
+        "variableType" : "DescribeLoggingOptionsResult",
+        "documentation" : null,
+        "simpleType" : "DescribeLoggingOptionsResult",
+        "variableSetterType" : "DescribeLoggingOptionsResult"
+      },
+      "wrapper" : false
+    },
+    "DetectorDebugOption" : {
+      "c2jName" : "DetectorDebugOption",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The detector model and the specific detectors (instances) for which the logging level is given.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyValue",
+        "c2jShape" : "KeyValue",
+        "deprecated" : false,
+        "documentation" : "<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@param keyValue The value of the input attribute key used to create the detector (the instance of the detector model).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyValue",
+        "getterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@return The value of the input attribute key used to create the detector (the instance of the detector model).*/",
+        "getterMethodName" : "getKeyValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyValue",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyValue",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@param keyValue The value of the input attribute key used to create the detector (the instance of the detector model).*/",
+        "setterMethodName" : "setKeyValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@param keyValue The value of the input attribute key used to create the detector (the instance of the detector model).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyValue" : {
+          "c2jName" : "keyValue",
+          "c2jShape" : "KeyValue",
+          "deprecated" : false,
+          "documentation" : "<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@param keyValue The value of the input attribute key used to create the detector (the instance of the detector model).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyValue",
+          "getterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@return The value of the input attribute key used to create the detector (the instance of the detector model).*/",
+          "getterMethodName" : "getKeyValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "keyValue",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyValue",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyValue",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@param keyValue The value of the input attribute key used to create the detector (the instance of the detector model).*/",
+          "setterMethodName" : "setKeyValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>\n@param keyValue The value of the input attribute key used to create the detector (the instance of the detector model).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName" ],
+      "shapeName" : "DetectorDebugOption",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorDebugOption",
+        "variableName" : "detectorDebugOption",
+        "variableType" : "DetectorDebugOption",
+        "documentation" : null,
+        "simpleType" : "DetectorDebugOption",
+        "variableSetterType" : "DetectorDebugOption"
+      },
+      "wrapper" : false
+    },
+    "DetectorModel" : {
+      "c2jName" : "DetectorModel",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the detector model.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelDefinition",
+        "c2jShape" : "DetectorModelDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>Information that defines how a detector operates.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDefinition",
+        "getterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@return Information that defines how a detector operates.*/",
+        "getterMethodName" : "getDetectorModelDefinition",
+        "getterModel" : {
+          "returnType" : "DetectorModelDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDefinition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDefinition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModelDefinition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.*/",
+        "setterMethodName" : "setDetectorModelDefinition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelDefinition",
+          "variableName" : "detectorModelDefinition",
+          "variableType" : "DetectorModelDefinition",
+          "documentation" : "",
+          "simpleType" : "DetectorModelDefinition",
+          "variableSetterType" : "DetectorModelDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelDefinition",
+          "variableName" : "detectorModelDefinition",
+          "variableType" : "DetectorModelDefinition",
+          "documentation" : "<p>Information that defines how a detector operates.</p>",
+          "simpleType" : "DetectorModelDefinition",
+          "variableSetterType" : "DetectorModelDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelConfiguration",
+        "c2jShape" : "DetectorModelConfiguration",
+        "deprecated" : false,
+        "documentation" : "<p>Information about how the detector is configured.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@param detectorModelConfiguration Information about how the detector is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelConfiguration",
+        "getterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@return Information about how the detector is configured.*/",
+        "getterMethodName" : "getDetectorModelConfiguration",
+        "getterModel" : {
+          "returnType" : "DetectorModelConfiguration",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelConfiguration",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelConfiguration",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModelConfiguration",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@param detectorModelConfiguration Information about how the detector is configured.*/",
+        "setterMethodName" : "setDetectorModelConfiguration",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelConfiguration",
+          "variableName" : "detectorModelConfiguration",
+          "variableType" : "DetectorModelConfiguration",
+          "documentation" : "",
+          "simpleType" : "DetectorModelConfiguration",
+          "variableSetterType" : "DetectorModelConfiguration"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@param detectorModelConfiguration Information about how the detector is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelConfiguration",
+          "variableName" : "detectorModelConfiguration",
+          "variableType" : "DetectorModelConfiguration",
+          "documentation" : "<p>Information about how the detector is configured.</p>",
+          "simpleType" : "DetectorModelConfiguration",
+          "variableSetterType" : "DetectorModelConfiguration"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelConfiguration" : {
+          "c2jName" : "detectorModelConfiguration",
+          "c2jShape" : "DetectorModelConfiguration",
+          "deprecated" : false,
+          "documentation" : "<p>Information about how the detector is configured.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@param detectorModelConfiguration Information about how the detector is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelConfiguration",
+          "getterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@return Information about how the detector is configured.*/",
+          "getterMethodName" : "getDetectorModelConfiguration",
+          "getterModel" : {
+            "returnType" : "DetectorModelConfiguration",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelConfiguration",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelConfiguration",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModelConfiguration",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@param detectorModelConfiguration Information about how the detector is configured.*/",
+          "setterMethodName" : "setDetectorModelConfiguration",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelConfiguration",
+            "variableName" : "detectorModelConfiguration",
+            "variableType" : "DetectorModelConfiguration",
+            "documentation" : "",
+            "simpleType" : "DetectorModelConfiguration",
+            "variableSetterType" : "DetectorModelConfiguration"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about how the detector is configured.</p>\n@param detectorModelConfiguration Information about how the detector is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelConfiguration",
+            "variableName" : "detectorModelConfiguration",
+            "variableType" : "DetectorModelConfiguration",
+            "documentation" : "<p>Information about how the detector is configured.</p>",
+            "simpleType" : "DetectorModelConfiguration",
+            "variableSetterType" : "DetectorModelConfiguration"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelDefinition" : {
+          "c2jName" : "detectorModelDefinition",
+          "c2jShape" : "DetectorModelDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>Information that defines how a detector operates.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDefinition",
+          "getterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@return Information that defines how a detector operates.*/",
+          "getterMethodName" : "getDetectorModelDefinition",
+          "getterModel" : {
+            "returnType" : "DetectorModelDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDefinition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDefinition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModelDefinition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.*/",
+          "setterMethodName" : "setDetectorModelDefinition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelDefinition",
+            "variableName" : "detectorModelDefinition",
+            "variableType" : "DetectorModelDefinition",
+            "documentation" : "",
+            "simpleType" : "DetectorModelDefinition",
+            "variableSetterType" : "DetectorModelDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelDefinition",
+            "variableName" : "detectorModelDefinition",
+            "variableType" : "DetectorModelDefinition",
+            "documentation" : "<p>Information that defines how a detector operates.</p>",
+            "simpleType" : "DetectorModelDefinition",
+            "variableSetterType" : "DetectorModelDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorModel",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorModel",
+        "variableName" : "detectorModel",
+        "variableType" : "DetectorModel",
+        "documentation" : null,
+        "simpleType" : "DetectorModel",
+        "variableSetterType" : "DetectorModel"
+      },
+      "wrapper" : false
+    },
+    "DetectorModelConfiguration" : {
+      "c2jName" : "DetectorModelConfiguration",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about how the detector model is configured.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelVersion",
+        "c2jShape" : "DetectorModelVersion",
+        "deprecated" : false,
+        "documentation" : "<p>The version of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelVersion",
+        "getterDocumentation" : "/**<p>The version of the detector model.</p>\n@return The version of the detector model.*/",
+        "getterMethodName" : "getDetectorModelVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelVersion",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelVersion",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.*/",
+        "setterMethodName" : "setDetectorModelVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "<p>The version of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelDescription",
+        "c2jShape" : "DetectorModelDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDescription",
+        "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+        "getterMethodName" : "getDetectorModelDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+        "setterMethodName" : "setDetectorModelDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelArn",
+        "c2jShape" : "DetectorModelArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@param detectorModelArn The ARN of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelArn",
+        "getterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@return The ARN of the detector model.*/",
+        "getterMethodName" : "getDetectorModelArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@param detectorModelArn The ARN of the detector model.*/",
+        "setterMethodName" : "setDetectorModelArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@param detectorModelArn The ARN of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector model was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the detector model was created.</p>\n@return The time the detector model was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector model was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "lastUpdateTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector model was last updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@param lastUpdateTime The time the detector model was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLastUpdateTime",
+        "getterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@return The time the detector model was last updated.*/",
+        "getterMethodName" : "getLastUpdateTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "lastUpdateTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "lastUpdateTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "LastUpdateTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@param lastUpdateTime The time the detector model was last updated.*/",
+        "setterMethodName" : "setLastUpdateTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@param lastUpdateTime The time the detector model was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector model was last updated.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "status",
+        "c2jShape" : "DetectorModelVersionStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the detector model.</p>",
+        "enumType" : "DetectorModelVersionStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the detector model.</p>\n@param status The status of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+        "fluentSetterMethodName" : "withStatus",
+        "getterDocumentation" : "/**<p>The status of the detector model.</p>\n@return The status of the detector model.\n@see DetectorModelVersionStatus*/",
+        "getterMethodName" : "getStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "status",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "status",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Status",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the detector model.</p>\n@param status The status of the detector model.\n@see DetectorModelVersionStatus*/",
+        "setterMethodName" : "setStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the detector model.</p>\n@param status The status of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "key",
+        "c2jShape" : "AttributeJsonPath",
+        "deprecated" : false,
+        "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKey",
+        "getterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@return The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+        "getterMethodName" : "getKey",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "key",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "key",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Key",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+        "setterMethodName" : "setKey",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "key",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "key",
+          "variableType" : "String",
+          "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector model was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the detector model was created.</p>\n@return The time the detector model was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector model was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelArn" : {
+          "c2jName" : "detectorModelArn",
+          "c2jShape" : "DetectorModelArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@param detectorModelArn The ARN of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelArn",
+          "getterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@return The ARN of the detector model.*/",
+          "getterMethodName" : "getDetectorModelArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@param detectorModelArn The ARN of the detector model.*/",
+          "setterMethodName" : "setDetectorModelArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the detector model.</p>\n@param detectorModelArn The ARN of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelDescription" : {
+          "c2jName" : "detectorModelDescription",
+          "c2jShape" : "DetectorModelDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDescription",
+          "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+          "getterMethodName" : "getDetectorModelDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+          "setterMethodName" : "setDetectorModelDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelVersion" : {
+          "c2jName" : "detectorModelVersion",
+          "c2jShape" : "DetectorModelVersion",
+          "deprecated" : false,
+          "documentation" : "<p>The version of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelVersion",
+          "getterDocumentation" : "/**<p>The version of the detector model.</p>\n@return The version of the detector model.*/",
+          "getterMethodName" : "getDetectorModelVersion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelVersion",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelVersion",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.*/",
+          "setterMethodName" : "setDetectorModelVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The version of the detector model.</p>\n@param detectorModelVersion The version of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "<p>The version of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Key" : {
+          "c2jName" : "key",
+          "c2jShape" : "AttributeJsonPath",
+          "deprecated" : false,
+          "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKey",
+          "getterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@return The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+          "getterMethodName" : "getKey",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "key",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "key",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Key",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.*/",
+          "setterMethodName" : "setKey",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "key",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>\n@param key The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "key",
+            "variableType" : "String",
+            "documentation" : "<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "LastUpdateTime" : {
+          "c2jName" : "lastUpdateTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector model was last updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@param lastUpdateTime The time the detector model was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLastUpdateTime",
+          "getterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@return The time the detector model was last updated.*/",
+          "getterMethodName" : "getLastUpdateTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "lastUpdateTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "lastUpdateTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "LastUpdateTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@param lastUpdateTime The time the detector model was last updated.*/",
+          "setterMethodName" : "setLastUpdateTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector model was last updated.</p>\n@param lastUpdateTime The time the detector model was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector model was last updated.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Status" : {
+          "c2jName" : "status",
+          "c2jShape" : "DetectorModelVersionStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the detector model.</p>",
+          "enumType" : "DetectorModelVersionStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the detector model.</p>\n@param status The status of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+          "fluentSetterMethodName" : "withStatus",
+          "getterDocumentation" : "/**<p>The status of the detector model.</p>\n@return The status of the detector model.\n@see DetectorModelVersionStatus*/",
+          "getterMethodName" : "getStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "status",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "status",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Status",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the detector model.</p>\n@param status The status of the detector model.\n@see DetectorModelVersionStatus*/",
+          "setterMethodName" : "setStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the detector model.</p>\n@param status The status of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorModelConfiguration",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorModelConfiguration",
+        "variableName" : "detectorModelConfiguration",
+        "variableType" : "DetectorModelConfiguration",
+        "documentation" : null,
+        "simpleType" : "DetectorModelConfiguration",
+        "variableSetterType" : "DetectorModelConfiguration"
+      },
+      "wrapper" : false
+    },
+    "DetectorModelDefinition" : {
+      "c2jName" : "DetectorModelDefinition",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information that defines how a detector operates.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "states",
+        "c2jShape" : "States",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the states of the detector.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the states of the detector.</p>\n@param states Information about the states of the detector.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStates",
+        "getterDocumentation" : "/**<p>Information about the states of the detector.</p>\n@return Information about the states of the detector.*/",
+        "getterMethodName" : "getStates",
+        "getterModel" : {
+          "returnType" : "java.util.List<State>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "states",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "states",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "State",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "State",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "State",
+              "variableName" : "member",
+              "variableType" : "State",
+              "documentation" : "",
+              "simpleType" : "State",
+              "variableSetterType" : "State"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "State",
+              "variableName" : "member",
+              "variableType" : "State",
+              "documentation" : "",
+              "simpleType" : "State",
+              "variableSetterType" : "State"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "State",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "State",
+          "templateImplType" : "java.util.ArrayList<State>",
+          "templateType" : "java.util.List<State>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "States",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the states of the detector.</p>\n@param states Information about the states of the detector.*/",
+        "setterMethodName" : "setStates",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<State>",
+          "variableName" : "states",
+          "variableType" : "java.util.List<State>",
+          "documentation" : "",
+          "simpleType" : "List<State>",
+          "variableSetterType" : "java.util.Collection<State>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the states of the detector.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setStates(java.util.Collection)} or {@link #withStates(java.util.Collection)} if you want to override the existing values.</p>\n@param states Information about the states of the detector.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<State>",
+          "variableName" : "states",
+          "variableType" : "java.util.List<State>",
+          "documentation" : "<p>Information about the states of the detector.</p>",
+          "simpleType" : "List<State>",
+          "variableSetterType" : "java.util.Collection<State>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "initialStateName",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>The state that is entered at the creation of each detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@param initialStateName The state that is entered at the creation of each detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInitialStateName",
+        "getterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@return The state that is entered at the creation of each detector (instance).*/",
+        "getterMethodName" : "getInitialStateName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "initialStateName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "initialStateName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InitialStateName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@param initialStateName The state that is entered at the creation of each detector (instance).*/",
+        "setterMethodName" : "setInitialStateName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "initialStateName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@param initialStateName The state that is entered at the creation of each detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "initialStateName",
+          "variableType" : "String",
+          "documentation" : "<p>The state that is entered at the creation of each detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InitialStateName" : {
+          "c2jName" : "initialStateName",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>The state that is entered at the creation of each detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@param initialStateName The state that is entered at the creation of each detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInitialStateName",
+          "getterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@return The state that is entered at the creation of each detector (instance).*/",
+          "getterMethodName" : "getInitialStateName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "initialStateName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "initialStateName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InitialStateName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@param initialStateName The state that is entered at the creation of each detector (instance).*/",
+          "setterMethodName" : "setInitialStateName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "initialStateName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The state that is entered at the creation of each detector (instance).</p>\n@param initialStateName The state that is entered at the creation of each detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "initialStateName",
+            "variableType" : "String",
+            "documentation" : "<p>The state that is entered at the creation of each detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "States" : {
+          "c2jName" : "states",
+          "c2jShape" : "States",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the states of the detector.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the states of the detector.</p>\n@param states Information about the states of the detector.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStates",
+          "getterDocumentation" : "/**<p>Information about the states of the detector.</p>\n@return Information about the states of the detector.*/",
+          "getterMethodName" : "getStates",
+          "getterModel" : {
+            "returnType" : "java.util.List<State>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "states",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "states",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "State",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "State",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "State",
+                "variableName" : "member",
+                "variableType" : "State",
+                "documentation" : "",
+                "simpleType" : "State",
+                "variableSetterType" : "State"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "State",
+                "variableName" : "member",
+                "variableType" : "State",
+                "documentation" : "",
+                "simpleType" : "State",
+                "variableSetterType" : "State"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "State",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "State",
+            "templateImplType" : "java.util.ArrayList<State>",
+            "templateType" : "java.util.List<State>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "States",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the states of the detector.</p>\n@param states Information about the states of the detector.*/",
+          "setterMethodName" : "setStates",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<State>",
+            "variableName" : "states",
+            "variableType" : "java.util.List<State>",
+            "documentation" : "",
+            "simpleType" : "List<State>",
+            "variableSetterType" : "java.util.Collection<State>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the states of the detector.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setStates(java.util.Collection)} or {@link #withStates(java.util.Collection)} if you want to override the existing values.</p>\n@param states Information about the states of the detector.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<State>",
+            "variableName" : "states",
+            "variableType" : "java.util.List<State>",
+            "documentation" : "<p>Information about the states of the detector.</p>",
+            "simpleType" : "List<State>",
+            "variableSetterType" : "java.util.Collection<State>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "states", "initialStateName" ],
+      "shapeName" : "DetectorModelDefinition",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorModelDefinition",
+        "variableName" : "detectorModelDefinition",
+        "variableType" : "DetectorModelDefinition",
+        "documentation" : null,
+        "simpleType" : "DetectorModelDefinition",
+        "variableSetterType" : "DetectorModelDefinition"
+      },
+      "wrapper" : false
+    },
+    "DetectorModelSummary" : {
+      "c2jName" : "DetectorModelSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the detector model.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelDescription",
+        "c2jShape" : "DetectorModelDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDescription",
+        "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+        "getterMethodName" : "getDetectorModelDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+        "setterMethodName" : "setDetectorModelDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector model was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the detector model was created.</p>\n@return The time the detector model was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector model was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector model was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the detector model was created.</p>\n@return The time the detector model was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector model was created.</p>\n@param creationTime The time the detector model was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector model was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelDescription" : {
+          "c2jName" : "detectorModelDescription",
+          "c2jShape" : "DetectorModelDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDescription",
+          "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+          "getterMethodName" : "getDetectorModelDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+          "setterMethodName" : "setDetectorModelDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorModelSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorModelSummary",
+        "variableName" : "detectorModelSummary",
+        "variableType" : "DetectorModelSummary",
+        "documentation" : null,
+        "simpleType" : "DetectorModelSummary",
+        "variableSetterType" : "DetectorModelSummary"
+      },
+      "wrapper" : false
+    },
+    "DetectorModelVersionStatus" : {
+      "c2jName" : "DetectorModelVersionStatus",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "ACTIVE",
+        "value" : "ACTIVE"
+      }, {
+        "name" : "ACTIVATING",
+        "value" : "ACTIVATING"
+      }, {
+        "name" : "INACTIVE",
+        "value" : "INACTIVE"
+      }, {
+        "name" : "DEPRECATED",
+        "value" : "DEPRECATED"
+      }, {
+        "name" : "DRAFT",
+        "value" : "DRAFT"
+      }, {
+        "name" : "PAUSED",
+        "value" : "PAUSED"
+      }, {
+        "name" : "FAILED",
+        "value" : "FAILED"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorModelVersionStatus",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorModelVersionStatus",
+        "variableName" : "detectorModelVersionStatus",
+        "variableType" : "DetectorModelVersionStatus",
+        "documentation" : null,
+        "simpleType" : "DetectorModelVersionStatus",
+        "variableSetterType" : "DetectorModelVersionStatus"
+      },
+      "wrapper" : false
+    },
+    "DetectorModelVersionSummary" : {
+      "c2jName" : "DetectorModelVersionSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the detector model version.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelVersion",
+        "c2jShape" : "DetectorModelVersion",
+        "deprecated" : false,
+        "documentation" : "<p>The ID of the detector model version.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@param detectorModelVersion The ID of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelVersion",
+        "getterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@return The ID of the detector model version.*/",
+        "getterMethodName" : "getDetectorModelVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelVersion",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelVersion",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@param detectorModelVersion The ID of the detector model version.*/",
+        "setterMethodName" : "setDetectorModelVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@param detectorModelVersion The ID of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "<p>The ID of the detector model version.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelArn",
+        "c2jShape" : "DetectorModelArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the detector model version.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@param detectorModelArn The ARN of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelArn",
+        "getterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@return The ARN of the detector model version.*/",
+        "getterMethodName" : "getDetectorModelArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@param detectorModelArn The ARN of the detector model version.*/",
+        "setterMethodName" : "setDetectorModelArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@param detectorModelArn The ARN of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the detector model version.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@param roleArn The ARN of the role that grants the detector model permission to perform its tasks.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@return The ARN of the role that grants the detector model permission to perform its tasks.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@param roleArn The ARN of the role that grants the detector model permission to perform its tasks.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@param roleArn The ARN of the role that grants the detector model permission to perform its tasks.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector model version was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@param creationTime The time the detector model version was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@return The time the detector model version was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@param creationTime The time the detector model version was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@param creationTime The time the detector model version was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector model version was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "lastUpdateTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The last time the detector model version was updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@param lastUpdateTime The last time the detector model version was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLastUpdateTime",
+        "getterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@return The last time the detector model version was updated.*/",
+        "getterMethodName" : "getLastUpdateTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "lastUpdateTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "lastUpdateTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "LastUpdateTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@param lastUpdateTime The last time the detector model version was updated.*/",
+        "setterMethodName" : "setLastUpdateTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@param lastUpdateTime The last time the detector model version was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The last time the detector model version was updated.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "status",
+        "c2jShape" : "DetectorModelVersionStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the detector model version.</p>",
+        "enumType" : "DetectorModelVersionStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the detector model version.</p>\n@param status The status of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+        "fluentSetterMethodName" : "withStatus",
+        "getterDocumentation" : "/**<p>The status of the detector model version.</p>\n@return The status of the detector model version.\n@see DetectorModelVersionStatus*/",
+        "getterMethodName" : "getStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "status",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "status",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Status",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the detector model version.</p>\n@param status The status of the detector model version.\n@see DetectorModelVersionStatus*/",
+        "setterMethodName" : "setStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the detector model version.</p>\n@param status The status of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the detector model version.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector model version was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@param creationTime The time the detector model version was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@return The time the detector model version was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@param creationTime The time the detector model version was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector model version was created.</p>\n@param creationTime The time the detector model version was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector model version was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelArn" : {
+          "c2jName" : "detectorModelArn",
+          "c2jShape" : "DetectorModelArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the detector model version.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@param detectorModelArn The ARN of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelArn",
+          "getterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@return The ARN of the detector model version.*/",
+          "getterMethodName" : "getDetectorModelArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@param detectorModelArn The ARN of the detector model version.*/",
+          "setterMethodName" : "setDetectorModelArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the detector model version.</p>\n@param detectorModelArn The ARN of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the detector model version.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model.</p>\n@return The name of the detector model.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model.</p>\n@param detectorModelName The name of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelVersion" : {
+          "c2jName" : "detectorModelVersion",
+          "c2jShape" : "DetectorModelVersion",
+          "deprecated" : false,
+          "documentation" : "<p>The ID of the detector model version.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@param detectorModelVersion The ID of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelVersion",
+          "getterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@return The ID of the detector model version.*/",
+          "getterMethodName" : "getDetectorModelVersion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelVersion",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelVersion",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@param detectorModelVersion The ID of the detector model version.*/",
+          "setterMethodName" : "setDetectorModelVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ID of the detector model version.</p>\n@param detectorModelVersion The ID of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "<p>The ID of the detector model version.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "LastUpdateTime" : {
+          "c2jName" : "lastUpdateTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The last time the detector model version was updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@param lastUpdateTime The last time the detector model version was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLastUpdateTime",
+          "getterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@return The last time the detector model version was updated.*/",
+          "getterMethodName" : "getLastUpdateTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "lastUpdateTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "lastUpdateTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "LastUpdateTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@param lastUpdateTime The last time the detector model version was updated.*/",
+          "setterMethodName" : "setLastUpdateTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The last time the detector model version was updated.</p>\n@param lastUpdateTime The last time the detector model version was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The last time the detector model version was updated.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@param roleArn The ARN of the role that grants the detector model permission to perform its tasks.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@return The ARN of the role that grants the detector model permission to perform its tasks.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@param roleArn The ARN of the role that grants the detector model permission to perform its tasks.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>\n@param roleArn The ARN of the role that grants the detector model permission to perform its tasks.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Status" : {
+          "c2jName" : "status",
+          "c2jShape" : "DetectorModelVersionStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the detector model version.</p>",
+          "enumType" : "DetectorModelVersionStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the detector model version.</p>\n@param status The status of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+          "fluentSetterMethodName" : "withStatus",
+          "getterDocumentation" : "/**<p>The status of the detector model version.</p>\n@return The status of the detector model version.\n@see DetectorModelVersionStatus*/",
+          "getterMethodName" : "getStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "status",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "status",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Status",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the detector model version.</p>\n@param status The status of the detector model version.\n@see DetectorModelVersionStatus*/",
+          "setterMethodName" : "setStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the detector model version.</p>\n@param status The status of the detector model version.\n@return Returns a reference to this object so that method calls can be chained together.\n@see DetectorModelVersionStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the detector model version.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorModelVersionSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorModelVersionSummary",
+        "variableName" : "detectorModelVersionSummary",
+        "variableType" : "DetectorModelVersionSummary",
+        "documentation" : null,
+        "simpleType" : "DetectorModelVersionSummary",
+        "variableSetterType" : "DetectorModelVersionSummary"
+      },
+      "wrapper" : false
+    },
+    "Event" : {
+      "c2jName" : "Event",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Specifies the <code>actions</code> to be performed when the <code>condition</code> evaluates to TRUE.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "eventName",
+        "c2jShape" : "EventName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the event.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the event.</p>\n@param eventName The name of the event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEventName",
+        "getterDocumentation" : "/**<p>The name of the event.</p>\n@return The name of the event.*/",
+        "getterMethodName" : "getEventName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "eventName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "eventName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "EventName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the event.</p>\n@param eventName The name of the event.*/",
+        "setterMethodName" : "setEventName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "eventName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the event.</p>\n@param eventName The name of the event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "eventName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the event.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "condition",
+        "c2jShape" : "Condition",
+        "deprecated" : false,
+        "documentation" : "<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@param condition [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCondition",
+        "getterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@return [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).*/",
+        "getterMethodName" : "getCondition",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "condition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "condition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Condition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@param condition [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).*/",
+        "setterMethodName" : "setCondition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "condition",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@param condition [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "condition",
+          "variableType" : "String",
+          "documentation" : "<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "actions",
+        "c2jShape" : "Actions",
+        "deprecated" : false,
+        "documentation" : "<p>The actions to be performed.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withActions",
+        "getterDocumentation" : "/**<p>The actions to be performed.</p>\n@return The actions to be performed.*/",
+        "getterMethodName" : "getActions",
+        "getterModel" : {
+          "returnType" : "java.util.List<Action>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "actions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "actions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Action",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Action",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Action",
+              "variableName" : "member",
+              "variableType" : "Action",
+              "documentation" : "",
+              "simpleType" : "Action",
+              "variableSetterType" : "Action"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Action",
+              "variableName" : "member",
+              "variableType" : "Action",
+              "documentation" : "",
+              "simpleType" : "Action",
+              "variableSetterType" : "Action"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Action",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Action",
+          "templateImplType" : "java.util.ArrayList<Action>",
+          "templateType" : "java.util.List<Action>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Actions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.*/",
+        "setterMethodName" : "setActions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Action>",
+          "variableName" : "actions",
+          "variableType" : "java.util.List<Action>",
+          "documentation" : "",
+          "simpleType" : "List<Action>",
+          "variableSetterType" : "java.util.Collection<Action>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The actions to be performed.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setActions(java.util.Collection)} or {@link #withActions(java.util.Collection)} if you want to override the existing values.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Action>",
+          "variableName" : "actions",
+          "variableType" : "java.util.List<Action>",
+          "documentation" : "<p>The actions to be performed.</p>",
+          "simpleType" : "List<Action>",
+          "variableSetterType" : "java.util.Collection<Action>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Actions" : {
+          "c2jName" : "actions",
+          "c2jShape" : "Actions",
+          "deprecated" : false,
+          "documentation" : "<p>The actions to be performed.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withActions",
+          "getterDocumentation" : "/**<p>The actions to be performed.</p>\n@return The actions to be performed.*/",
+          "getterMethodName" : "getActions",
+          "getterModel" : {
+            "returnType" : "java.util.List<Action>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "actions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "actions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Action",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Action",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Action",
+                "variableName" : "member",
+                "variableType" : "Action",
+                "documentation" : "",
+                "simpleType" : "Action",
+                "variableSetterType" : "Action"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Action",
+                "variableName" : "member",
+                "variableType" : "Action",
+                "documentation" : "",
+                "simpleType" : "Action",
+                "variableSetterType" : "Action"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Action",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Action",
+            "templateImplType" : "java.util.ArrayList<Action>",
+            "templateType" : "java.util.List<Action>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Actions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.*/",
+          "setterMethodName" : "setActions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Action>",
+            "variableName" : "actions",
+            "variableType" : "java.util.List<Action>",
+            "documentation" : "",
+            "simpleType" : "List<Action>",
+            "variableSetterType" : "java.util.Collection<Action>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The actions to be performed.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setActions(java.util.Collection)} or {@link #withActions(java.util.Collection)} if you want to override the existing values.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Action>",
+            "variableName" : "actions",
+            "variableType" : "java.util.List<Action>",
+            "documentation" : "<p>The actions to be performed.</p>",
+            "simpleType" : "List<Action>",
+            "variableSetterType" : "java.util.Collection<Action>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Condition" : {
+          "c2jName" : "condition",
+          "c2jShape" : "Condition",
+          "deprecated" : false,
+          "documentation" : "<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@param condition [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCondition",
+          "getterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@return [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).*/",
+          "getterMethodName" : "getCondition",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "condition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "condition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Condition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@param condition [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).*/",
+          "setterMethodName" : "setCondition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "condition",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>\n@param condition [Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "condition",
+            "variableType" : "String",
+            "documentation" : "<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "EventName" : {
+          "c2jName" : "eventName",
+          "c2jShape" : "EventName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the event.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the event.</p>\n@param eventName The name of the event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEventName",
+          "getterDocumentation" : "/**<p>The name of the event.</p>\n@return The name of the event.*/",
+          "getterMethodName" : "getEventName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "eventName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "eventName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "EventName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the event.</p>\n@param eventName The name of the event.*/",
+          "setterMethodName" : "setEventName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "eventName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the event.</p>\n@param eventName The name of the event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "eventName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the event.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "eventName" ],
+      "shapeName" : "Event",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Event",
+        "variableName" : "event",
+        "variableType" : "Event",
+        "documentation" : null,
+        "simpleType" : "Event",
+        "variableSetterType" : "Event"
+      },
+      "wrapper" : false
+    },
+    "Input" : {
+      "c2jName" : "Input",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the input.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "inputConfiguration",
+        "c2jShape" : "InputConfiguration",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the configuration of an input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@param inputConfiguration Information about the configuration of an input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputConfiguration",
+        "getterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@return Information about the configuration of an input.*/",
+        "getterMethodName" : "getInputConfiguration",
+        "getterModel" : {
+          "returnType" : "InputConfiguration",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputConfiguration",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputConfiguration",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "InputConfiguration",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@param inputConfiguration Information about the configuration of an input.*/",
+        "setterMethodName" : "setInputConfiguration",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputConfiguration",
+          "variableName" : "inputConfiguration",
+          "variableType" : "InputConfiguration",
+          "documentation" : "",
+          "simpleType" : "InputConfiguration",
+          "variableSetterType" : "InputConfiguration"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@param inputConfiguration Information about the configuration of an input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputConfiguration",
+          "variableName" : "inputConfiguration",
+          "variableType" : "InputConfiguration",
+          "documentation" : "<p>Information about the configuration of an input.</p>",
+          "simpleType" : "InputConfiguration",
+          "variableSetterType" : "InputConfiguration"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDefinition",
+        "c2jShape" : "InputDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>The definition of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDefinition",
+        "getterDocumentation" : "/**<p>The definition of the input.</p>\n@return The definition of the input.*/",
+        "getterMethodName" : "getInputDefinition",
+        "getterModel" : {
+          "returnType" : "InputDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDefinition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDefinition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "InputDefinition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.*/",
+        "setterMethodName" : "setInputDefinition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputDefinition",
+          "variableName" : "inputDefinition",
+          "variableType" : "InputDefinition",
+          "documentation" : "",
+          "simpleType" : "InputDefinition",
+          "variableSetterType" : "InputDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputDefinition",
+          "variableName" : "inputDefinition",
+          "variableType" : "InputDefinition",
+          "documentation" : "<p>The definition of the input.</p>",
+          "simpleType" : "InputDefinition",
+          "variableSetterType" : "InputDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputConfiguration" : {
+          "c2jName" : "inputConfiguration",
+          "c2jShape" : "InputConfiguration",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the configuration of an input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@param inputConfiguration Information about the configuration of an input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputConfiguration",
+          "getterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@return Information about the configuration of an input.*/",
+          "getterMethodName" : "getInputConfiguration",
+          "getterModel" : {
+            "returnType" : "InputConfiguration",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputConfiguration",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputConfiguration",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "InputConfiguration",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@param inputConfiguration Information about the configuration of an input.*/",
+          "setterMethodName" : "setInputConfiguration",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputConfiguration",
+            "variableName" : "inputConfiguration",
+            "variableType" : "InputConfiguration",
+            "documentation" : "",
+            "simpleType" : "InputConfiguration",
+            "variableSetterType" : "InputConfiguration"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the configuration of an input.</p>\n@param inputConfiguration Information about the configuration of an input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputConfiguration",
+            "variableName" : "inputConfiguration",
+            "variableType" : "InputConfiguration",
+            "documentation" : "<p>Information about the configuration of an input.</p>",
+            "simpleType" : "InputConfiguration",
+            "variableSetterType" : "InputConfiguration"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputDefinition" : {
+          "c2jName" : "inputDefinition",
+          "c2jShape" : "InputDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>The definition of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDefinition",
+          "getterDocumentation" : "/**<p>The definition of the input.</p>\n@return The definition of the input.*/",
+          "getterMethodName" : "getInputDefinition",
+          "getterModel" : {
+            "returnType" : "InputDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDefinition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDefinition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "InputDefinition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.*/",
+          "setterMethodName" : "setInputDefinition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputDefinition",
+            "variableName" : "inputDefinition",
+            "variableType" : "InputDefinition",
+            "documentation" : "",
+            "simpleType" : "InputDefinition",
+            "variableSetterType" : "InputDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputDefinition",
+            "variableName" : "inputDefinition",
+            "variableType" : "InputDefinition",
+            "documentation" : "<p>The definition of the input.</p>",
+            "simpleType" : "InputDefinition",
+            "variableSetterType" : "InputDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "Input",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Input",
+        "variableName" : "input",
+        "variableType" : "Input",
+        "documentation" : null,
+        "simpleType" : "Input",
+        "variableSetterType" : "Input"
+      },
+      "wrapper" : false
+    },
+    "InputConfiguration" : {
+      "c2jName" : "InputConfiguration",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the configuration of an input.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name of the input.</p>\n@return The name of the input.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDescription",
+        "c2jShape" : "InputDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDescription",
+        "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+        "getterMethodName" : "getInputDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+        "setterMethodName" : "setInputDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputArn",
+        "c2jShape" : "InputArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputArn",
+        "getterDocumentation" : "/**<p>The ARN of the input.</p>\n@return The ARN of the input.*/",
+        "getterMethodName" : "getInputArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.*/",
+        "setterMethodName" : "setInputArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the input was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the input was created.</p>\n@return The time the input was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the input was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "lastUpdateTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The last time the input was updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLastUpdateTime",
+        "getterDocumentation" : "/**<p>The last time the input was updated.</p>\n@return The last time the input was updated.*/",
+        "getterMethodName" : "getLastUpdateTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "lastUpdateTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "lastUpdateTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "LastUpdateTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.*/",
+        "setterMethodName" : "setLastUpdateTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The last time the input was updated.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "status",
+        "c2jShape" : "InputStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the input.</p>",
+        "enumType" : "InputStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+        "fluentSetterMethodName" : "withStatus",
+        "getterDocumentation" : "/**<p>The status of the input.</p>\n@return The status of the input.\n@see InputStatus*/",
+        "getterMethodName" : "getStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "status",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "status",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Status",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@see InputStatus*/",
+        "setterMethodName" : "setStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the input was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the input was created.</p>\n@return The time the input was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the input was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputArn" : {
+          "c2jName" : "inputArn",
+          "c2jShape" : "InputArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputArn",
+          "getterDocumentation" : "/**<p>The ARN of the input.</p>\n@return The ARN of the input.*/",
+          "getterMethodName" : "getInputArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.*/",
+          "setterMethodName" : "setInputArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputDescription" : {
+          "c2jName" : "inputDescription",
+          "c2jShape" : "InputDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDescription",
+          "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+          "getterMethodName" : "getInputDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+          "setterMethodName" : "setInputDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name of the input.</p>\n@return The name of the input.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "LastUpdateTime" : {
+          "c2jName" : "lastUpdateTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The last time the input was updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLastUpdateTime",
+          "getterDocumentation" : "/**<p>The last time the input was updated.</p>\n@return The last time the input was updated.*/",
+          "getterMethodName" : "getLastUpdateTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "lastUpdateTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "lastUpdateTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "LastUpdateTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.*/",
+          "setterMethodName" : "setLastUpdateTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The last time the input was updated.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Status" : {
+          "c2jName" : "status",
+          "c2jShape" : "InputStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the input.</p>",
+          "enumType" : "InputStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+          "fluentSetterMethodName" : "withStatus",
+          "getterDocumentation" : "/**<p>The status of the input.</p>\n@return The status of the input.\n@see InputStatus*/",
+          "getterMethodName" : "getStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "status",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "status",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Status",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@see InputStatus*/",
+          "setterMethodName" : "setStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "inputName", "inputArn", "creationTime", "lastUpdateTime", "status" ],
+      "shapeName" : "InputConfiguration",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InputConfiguration",
+        "variableName" : "inputConfiguration",
+        "variableType" : "InputConfiguration",
+        "documentation" : null,
+        "simpleType" : "InputConfiguration",
+        "variableSetterType" : "InputConfiguration"
+      },
+      "wrapper" : false
+    },
+    "InputDefinition" : {
+      "c2jName" : "InputDefinition",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The definition of the input.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "attributes",
+        "c2jShape" : "Attributes",
+        "deprecated" : false,
+        "documentation" : "<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n@param attributes The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAttributes",
+        "getterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n@return The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.*/",
+        "getterMethodName" : "getAttributes",
+        "getterModel" : {
+          "returnType" : "java.util.List<Attribute>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "attributes",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "attributes",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Attribute",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Attribute",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Attribute",
+              "variableName" : "member",
+              "variableType" : "Attribute",
+              "documentation" : "",
+              "simpleType" : "Attribute",
+              "variableSetterType" : "Attribute"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Attribute",
+              "variableName" : "member",
+              "variableType" : "Attribute",
+              "documentation" : "",
+              "simpleType" : "Attribute",
+              "variableSetterType" : "Attribute"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Attribute",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Attribute",
+          "templateImplType" : "java.util.ArrayList<Attribute>",
+          "templateType" : "java.util.List<Attribute>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Attributes",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n@param attributes The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.*/",
+        "setterMethodName" : "setAttributes",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Attribute>",
+          "variableName" : "attributes",
+          "variableType" : "java.util.List<Attribute>",
+          "documentation" : "",
+          "simpleType" : "List<Attribute>",
+          "variableSetterType" : "java.util.Collection<Attribute>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to override the existing values.</p>\n@param attributes The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Attribute>",
+          "variableName" : "attributes",
+          "variableType" : "java.util.List<Attribute>",
+          "documentation" : "<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>",
+          "simpleType" : "List<Attribute>",
+          "variableSetterType" : "java.util.Collection<Attribute>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Attributes" : {
+          "c2jName" : "attributes",
+          "c2jShape" : "Attributes",
+          "deprecated" : false,
+          "documentation" : "<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n@param attributes The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAttributes",
+          "getterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n@return The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.*/",
+          "getterMethodName" : "getAttributes",
+          "getterModel" : {
+            "returnType" : "java.util.List<Attribute>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "attributes",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "attributes",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Attribute",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Attribute",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Attribute",
+                "variableName" : "member",
+                "variableType" : "Attribute",
+                "documentation" : "",
+                "simpleType" : "Attribute",
+                "variableSetterType" : "Attribute"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Attribute",
+                "variableName" : "member",
+                "variableType" : "Attribute",
+                "documentation" : "",
+                "simpleType" : "Attribute",
+                "variableSetterType" : "Attribute"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Attribute",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Attribute",
+            "templateImplType" : "java.util.ArrayList<Attribute>",
+            "templateType" : "java.util.List<Attribute>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Attributes",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n@param attributes The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.*/",
+          "setterMethodName" : "setAttributes",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Attribute>",
+            "variableName" : "attributes",
+            "variableType" : "java.util.List<Attribute>",
+            "documentation" : "",
+            "simpleType" : "List<Attribute>",
+            "variableSetterType" : "java.util.Collection<Attribute>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to override the existing values.</p>\n@param attributes The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Attribute>",
+            "variableName" : "attributes",
+            "variableType" : "java.util.List<Attribute>",
+            "documentation" : "<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>",
+            "simpleType" : "List<Attribute>",
+            "variableSetterType" : "java.util.Collection<Attribute>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "attributes" ],
+      "shapeName" : "InputDefinition",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InputDefinition",
+        "variableName" : "inputDefinition",
+        "variableType" : "InputDefinition",
+        "documentation" : null,
+        "simpleType" : "InputDefinition",
+        "variableSetterType" : "InputDefinition"
+      },
+      "wrapper" : false
+    },
+    "InputStatus" : {
+      "c2jName" : "InputStatus",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "CREATING",
+        "value" : "CREATING"
+      }, {
+        "name" : "UPDATING",
+        "value" : "UPDATING"
+      }, {
+        "name" : "ACTIVE",
+        "value" : "ACTIVE"
+      }, {
+        "name" : "DELETING",
+        "value" : "DELETING"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InputStatus",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InputStatus",
+        "variableName" : "inputStatus",
+        "variableType" : "InputStatus",
+        "documentation" : null,
+        "simpleType" : "InputStatus",
+        "variableSetterType" : "InputStatus"
+      },
+      "wrapper" : false
+    },
+    "InputSummary" : {
+      "c2jName" : "InputSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the input.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name of the input.</p>\n@return The name of the input.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDescription",
+        "c2jShape" : "InputDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDescription",
+        "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+        "getterMethodName" : "getInputDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+        "setterMethodName" : "setInputDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputArn",
+        "c2jShape" : "InputArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputArn",
+        "getterDocumentation" : "/**<p>The ARN of the input.</p>\n@return The ARN of the input.*/",
+        "getterMethodName" : "getInputArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.*/",
+        "setterMethodName" : "setInputArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the input was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the input was created.</p>\n@return The time the input was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the input was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "lastUpdateTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The last time the input was updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLastUpdateTime",
+        "getterDocumentation" : "/**<p>The last time the input was updated.</p>\n@return The last time the input was updated.*/",
+        "getterMethodName" : "getLastUpdateTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "lastUpdateTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "lastUpdateTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "LastUpdateTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.*/",
+        "setterMethodName" : "setLastUpdateTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The last time the input was updated.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "status",
+        "c2jShape" : "InputStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the input.</p>",
+        "enumType" : "InputStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+        "fluentSetterMethodName" : "withStatus",
+        "getterDocumentation" : "/**<p>The status of the input.</p>\n@return The status of the input.\n@see InputStatus*/",
+        "getterMethodName" : "getStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "status",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "status",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Status",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@see InputStatus*/",
+        "setterMethodName" : "setStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the input was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the input was created.</p>\n@return The time the input was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the input was created.</p>\n@param creationTime The time the input was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the input was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputArn" : {
+          "c2jName" : "inputArn",
+          "c2jShape" : "InputArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputArn",
+          "getterDocumentation" : "/**<p>The ARN of the input.</p>\n@return The ARN of the input.*/",
+          "getterMethodName" : "getInputArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.*/",
+          "setterMethodName" : "setInputArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the input.</p>\n@param inputArn The ARN of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputDescription" : {
+          "c2jName" : "inputDescription",
+          "c2jShape" : "InputDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDescription",
+          "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+          "getterMethodName" : "getInputDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+          "setterMethodName" : "setInputDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name of the input.</p>\n@return The name of the input.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the input.</p>\n@param inputName The name of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "LastUpdateTime" : {
+          "c2jName" : "lastUpdateTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The last time the input was updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLastUpdateTime",
+          "getterDocumentation" : "/**<p>The last time the input was updated.</p>\n@return The last time the input was updated.*/",
+          "getterMethodName" : "getLastUpdateTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "lastUpdateTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "lastUpdateTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "LastUpdateTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.*/",
+          "setterMethodName" : "setLastUpdateTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The last time the input was updated.</p>\n@param lastUpdateTime The last time the input was updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The last time the input was updated.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Status" : {
+          "c2jName" : "status",
+          "c2jShape" : "InputStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the input.</p>",
+          "enumType" : "InputStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+          "fluentSetterMethodName" : "withStatus",
+          "getterDocumentation" : "/**<p>The status of the input.</p>\n@return The status of the input.\n@see InputStatus*/",
+          "getterMethodName" : "getStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "status",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "status",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Status",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@see InputStatus*/",
+          "setterMethodName" : "setStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the input.</p>\n@param status The status of the input.\n@return Returns a reference to this object so that method calls can be chained together.\n@see InputStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InputSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InputSummary",
+        "variableName" : "inputSummary",
+        "variableType" : "InputSummary",
+        "documentation" : null,
+        "simpleType" : "InputSummary",
+        "variableSetterType" : "InputSummary"
+      },
+      "wrapper" : false
+    },
+    "InternalFailureException" : {
+      "c2jName" : "InternalFailureException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>An internal failure occurred.</p>",
+      "enums" : null,
+      "errorCode" : "InternalFailureException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InternalFailureException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InternalFailureException",
+        "variableName" : "internalFailureException",
+        "variableType" : "InternalFailureException",
+        "documentation" : null,
+        "simpleType" : "InternalFailureException",
+        "variableSetterType" : "InternalFailureException"
+      },
+      "wrapper" : false
+    },
+    "InvalidRequestException" : {
+      "c2jName" : "InvalidRequestException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request was invalid.</p>",
+      "enums" : null,
+      "errorCode" : "InvalidRequestException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InvalidRequestException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InvalidRequestException",
+        "variableName" : "invalidRequestException",
+        "variableType" : "InvalidRequestException",
+        "documentation" : null,
+        "simpleType" : "InvalidRequestException",
+        "variableSetterType" : "InvalidRequestException"
+      },
+      "wrapper" : false
+    },
+    "IotTopicPublishAction" : {
+      "c2jName" : "IotTopicPublishAction",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information required to publish the MQTT message via the AWS IoT Message Broker.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "mqttTopic",
+        "c2jShape" : "MQTTTopic",
+        "deprecated" : false,
+        "documentation" : "<p>The MQTT topic of the message.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@param mqttTopic The MQTT topic of the message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMqttTopic",
+        "getterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@return The MQTT topic of the message.*/",
+        "getterMethodName" : "getMqttTopic",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "mqttTopic",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "mqttTopic",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "MqttTopic",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@param mqttTopic The MQTT topic of the message.*/",
+        "setterMethodName" : "setMqttTopic",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "mqttTopic",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@param mqttTopic The MQTT topic of the message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "mqttTopic",
+          "variableType" : "String",
+          "documentation" : "<p>The MQTT topic of the message.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "MqttTopic" : {
+          "c2jName" : "mqttTopic",
+          "c2jShape" : "MQTTTopic",
+          "deprecated" : false,
+          "documentation" : "<p>The MQTT topic of the message.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@param mqttTopic The MQTT topic of the message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMqttTopic",
+          "getterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@return The MQTT topic of the message.*/",
+          "getterMethodName" : "getMqttTopic",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "mqttTopic",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "mqttTopic",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "MqttTopic",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@param mqttTopic The MQTT topic of the message.*/",
+          "setterMethodName" : "setMqttTopic",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "mqttTopic",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The MQTT topic of the message.</p>\n@param mqttTopic The MQTT topic of the message.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "mqttTopic",
+            "variableType" : "String",
+            "documentation" : "<p>The MQTT topic of the message.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "mqttTopic" ],
+      "shapeName" : "IotTopicPublishAction",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "IotTopicPublishAction",
+        "variableName" : "iotTopicPublishAction",
+        "variableType" : "IotTopicPublishAction",
+        "documentation" : null,
+        "simpleType" : "IotTopicPublishAction",
+        "variableSetterType" : "IotTopicPublishAction"
+      },
+      "wrapper" : false
+    },
+    "LimitExceededException" : {
+      "c2jName" : "LimitExceededException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A limit was exceeded.</p>",
+      "enums" : null,
+      "errorCode" : "LimitExceededException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "LimitExceededException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "LimitExceededException",
+        "variableName" : "limitExceededException",
+        "variableType" : "LimitExceededException",
+        "documentation" : null,
+        "simpleType" : "LimitExceededException",
+        "variableSetterType" : "LimitExceededException"
+      },
+      "wrapper" : false
+    },
+    "ListDetectorModelVersionsRequest" : {
+      "c2jName" : "ListDetectorModelVersionsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListDetectorModelVersions",
+        "locationName" : null,
+        "requestUri" : "/detector-models/{detectorModelName}/versions",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model whose versions are returned.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@param detectorModelName The name of the detector model whose versions are returned.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@return The name of the detector model whose versions are returned.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@param detectorModelName The name of the detector model whose versions are returned.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@param detectorModelName The name of the detector model whose versions are returned.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model whose versions are returned.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>The token for the next set of results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "maxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "<p>The maximum number of results to return at one time.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model whose versions are returned.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@param detectorModelName The name of the detector model whose versions are returned.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@return The name of the detector model whose versions are returned.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@param detectorModelName The name of the detector model whose versions are returned.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model whose versions are returned.</p>\n@param detectorModelName The name of the detector model whose versions are returned.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model whose versions are returned.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MaxResults" : {
+          "c2jName" : "maxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "<p>The maximum number of results to return at one time.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>The token for the next set of results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName" ],
+      "shapeName" : "ListDetectorModelVersionsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorModelVersionsRequest",
+        "variableName" : "listDetectorModelVersionsRequest",
+        "variableType" : "ListDetectorModelVersionsRequest",
+        "documentation" : null,
+        "simpleType" : "ListDetectorModelVersionsRequest",
+        "variableSetterType" : "ListDetectorModelVersionsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListDetectorModelVersionsResult" : {
+      "c2jName" : "ListDetectorModelVersionsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelVersionSummaries",
+        "c2jShape" : "DetectorModelVersionSummaries",
+        "deprecated" : false,
+        "documentation" : "<p>Summary information about the detector model versions.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n@param detectorModelVersionSummaries Summary information about the detector model versions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelVersionSummaries",
+        "getterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n@return Summary information about the detector model versions.*/",
+        "getterMethodName" : "getDetectorModelVersionSummaries",
+        "getterModel" : {
+          "returnType" : "java.util.List<DetectorModelVersionSummary>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelVersionSummaries",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelVersionSummaries",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "DetectorModelVersionSummary",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "DetectorModelVersionSummary",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorModelVersionSummary",
+              "variableName" : "member",
+              "variableType" : "DetectorModelVersionSummary",
+              "documentation" : "",
+              "simpleType" : "DetectorModelVersionSummary",
+              "variableSetterType" : "DetectorModelVersionSummary"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorModelVersionSummary",
+              "variableName" : "member",
+              "variableType" : "DetectorModelVersionSummary",
+              "documentation" : "",
+              "simpleType" : "DetectorModelVersionSummary",
+              "variableSetterType" : "DetectorModelVersionSummary"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "DetectorModelVersionSummary",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "DetectorModelVersionSummary",
+          "templateImplType" : "java.util.ArrayList<DetectorModelVersionSummary>",
+          "templateType" : "java.util.List<DetectorModelVersionSummary>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "DetectorModelVersionSummaries",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n@param detectorModelVersionSummaries Summary information about the detector model versions.*/",
+        "setterMethodName" : "setDetectorModelVersionSummaries",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorModelVersionSummary>",
+          "variableName" : "detectorModelVersionSummaries",
+          "variableType" : "java.util.List<DetectorModelVersionSummary>",
+          "documentation" : "",
+          "simpleType" : "List<DetectorModelVersionSummary>",
+          "variableSetterType" : "java.util.Collection<DetectorModelVersionSummary>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorModelVersionSummaries(java.util.Collection)} or {@link #withDetectorModelVersionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorModelVersionSummaries Summary information about the detector model versions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorModelVersionSummary>",
+          "variableName" : "detectorModelVersionSummaries",
+          "variableType" : "java.util.List<DetectorModelVersionSummary>",
+          "documentation" : "<p>Summary information about the detector model versions.</p>",
+          "simpleType" : "List<DetectorModelVersionSummary>",
+          "variableSetterType" : "java.util.Collection<DetectorModelVersionSummary>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelVersionSummaries" : {
+          "c2jName" : "detectorModelVersionSummaries",
+          "c2jShape" : "DetectorModelVersionSummaries",
+          "deprecated" : false,
+          "documentation" : "<p>Summary information about the detector model versions.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n@param detectorModelVersionSummaries Summary information about the detector model versions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelVersionSummaries",
+          "getterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n@return Summary information about the detector model versions.*/",
+          "getterMethodName" : "getDetectorModelVersionSummaries",
+          "getterModel" : {
+            "returnType" : "java.util.List<DetectorModelVersionSummary>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelVersionSummaries",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelVersionSummaries",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "DetectorModelVersionSummary",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "DetectorModelVersionSummary",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorModelVersionSummary",
+                "variableName" : "member",
+                "variableType" : "DetectorModelVersionSummary",
+                "documentation" : "",
+                "simpleType" : "DetectorModelVersionSummary",
+                "variableSetterType" : "DetectorModelVersionSummary"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorModelVersionSummary",
+                "variableName" : "member",
+                "variableType" : "DetectorModelVersionSummary",
+                "documentation" : "",
+                "simpleType" : "DetectorModelVersionSummary",
+                "variableSetterType" : "DetectorModelVersionSummary"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "DetectorModelVersionSummary",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "DetectorModelVersionSummary",
+            "templateImplType" : "java.util.ArrayList<DetectorModelVersionSummary>",
+            "templateType" : "java.util.List<DetectorModelVersionSummary>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "DetectorModelVersionSummaries",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n@param detectorModelVersionSummaries Summary information about the detector model versions.*/",
+          "setterMethodName" : "setDetectorModelVersionSummaries",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorModelVersionSummary>",
+            "variableName" : "detectorModelVersionSummaries",
+            "variableType" : "java.util.List<DetectorModelVersionSummary>",
+            "documentation" : "",
+            "simpleType" : "List<DetectorModelVersionSummary>",
+            "variableSetterType" : "java.util.Collection<DetectorModelVersionSummary>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Summary information about the detector model versions.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorModelVersionSummaries(java.util.Collection)} or {@link #withDetectorModelVersionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorModelVersionSummaries Summary information about the detector model versions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorModelVersionSummary>",
+            "variableName" : "detectorModelVersionSummaries",
+            "variableType" : "java.util.List<DetectorModelVersionSummary>",
+            "documentation" : "<p>Summary information about the detector model versions.</p>",
+            "simpleType" : "List<DetectorModelVersionSummary>",
+            "variableSetterType" : "java.util.Collection<DetectorModelVersionSummary>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListDetectorModelVersionsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorModelVersionsResult",
+        "variableName" : "listDetectorModelVersionsResult",
+        "variableType" : "ListDetectorModelVersionsResult",
+        "documentation" : null,
+        "simpleType" : "ListDetectorModelVersionsResult",
+        "variableSetterType" : "ListDetectorModelVersionsResult"
+      },
+      "wrapper" : false
+    },
+    "ListDetectorModelsRequest" : {
+      "c2jName" : "ListDetectorModelsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListDetectorModels",
+        "locationName" : null,
+        "requestUri" : "/detector-models",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>The token for the next set of results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "maxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "<p>The maximum number of results to return at one time.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "MaxResults" : {
+          "c2jName" : "maxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "<p>The maximum number of results to return at one time.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>The token for the next set of results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListDetectorModelsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorModelsRequest",
+        "variableName" : "listDetectorModelsRequest",
+        "variableType" : "ListDetectorModelsRequest",
+        "documentation" : null,
+        "simpleType" : "ListDetectorModelsRequest",
+        "variableSetterType" : "ListDetectorModelsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListDetectorModelsResult" : {
+      "c2jName" : "ListDetectorModelsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelSummaries",
+        "c2jShape" : "DetectorModelSummaries",
+        "deprecated" : false,
+        "documentation" : "<p>Summary information about the detector models.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Summary information about the detector models.</p>\n@param detectorModelSummaries Summary information about the detector models.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelSummaries",
+        "getterDocumentation" : "/**<p>Summary information about the detector models.</p>\n@return Summary information about the detector models.*/",
+        "getterMethodName" : "getDetectorModelSummaries",
+        "getterModel" : {
+          "returnType" : "java.util.List<DetectorModelSummary>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelSummaries",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelSummaries",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "DetectorModelSummary",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "DetectorModelSummary",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorModelSummary",
+              "variableName" : "member",
+              "variableType" : "DetectorModelSummary",
+              "documentation" : "",
+              "simpleType" : "DetectorModelSummary",
+              "variableSetterType" : "DetectorModelSummary"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorModelSummary",
+              "variableName" : "member",
+              "variableType" : "DetectorModelSummary",
+              "documentation" : "",
+              "simpleType" : "DetectorModelSummary",
+              "variableSetterType" : "DetectorModelSummary"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "DetectorModelSummary",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "DetectorModelSummary",
+          "templateImplType" : "java.util.ArrayList<DetectorModelSummary>",
+          "templateType" : "java.util.List<DetectorModelSummary>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "DetectorModelSummaries",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Summary information about the detector models.</p>\n@param detectorModelSummaries Summary information about the detector models.*/",
+        "setterMethodName" : "setDetectorModelSummaries",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorModelSummary>",
+          "variableName" : "detectorModelSummaries",
+          "variableType" : "java.util.List<DetectorModelSummary>",
+          "documentation" : "",
+          "simpleType" : "List<DetectorModelSummary>",
+          "variableSetterType" : "java.util.Collection<DetectorModelSummary>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Summary information about the detector models.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorModelSummaries(java.util.Collection)} or {@link #withDetectorModelSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorModelSummaries Summary information about the detector models.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorModelSummary>",
+          "variableName" : "detectorModelSummaries",
+          "variableType" : "java.util.List<DetectorModelSummary>",
+          "documentation" : "<p>Summary information about the detector models.</p>",
+          "simpleType" : "List<DetectorModelSummary>",
+          "variableSetterType" : "java.util.Collection<DetectorModelSummary>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelSummaries" : {
+          "c2jName" : "detectorModelSummaries",
+          "c2jShape" : "DetectorModelSummaries",
+          "deprecated" : false,
+          "documentation" : "<p>Summary information about the detector models.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Summary information about the detector models.</p>\n@param detectorModelSummaries Summary information about the detector models.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelSummaries",
+          "getterDocumentation" : "/**<p>Summary information about the detector models.</p>\n@return Summary information about the detector models.*/",
+          "getterMethodName" : "getDetectorModelSummaries",
+          "getterModel" : {
+            "returnType" : "java.util.List<DetectorModelSummary>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelSummaries",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelSummaries",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "DetectorModelSummary",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "DetectorModelSummary",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorModelSummary",
+                "variableName" : "member",
+                "variableType" : "DetectorModelSummary",
+                "documentation" : "",
+                "simpleType" : "DetectorModelSummary",
+                "variableSetterType" : "DetectorModelSummary"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorModelSummary",
+                "variableName" : "member",
+                "variableType" : "DetectorModelSummary",
+                "documentation" : "",
+                "simpleType" : "DetectorModelSummary",
+                "variableSetterType" : "DetectorModelSummary"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "DetectorModelSummary",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "DetectorModelSummary",
+            "templateImplType" : "java.util.ArrayList<DetectorModelSummary>",
+            "templateType" : "java.util.List<DetectorModelSummary>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "DetectorModelSummaries",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Summary information about the detector models.</p>\n@param detectorModelSummaries Summary information about the detector models.*/",
+          "setterMethodName" : "setDetectorModelSummaries",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorModelSummary>",
+            "variableName" : "detectorModelSummaries",
+            "variableType" : "java.util.List<DetectorModelSummary>",
+            "documentation" : "",
+            "simpleType" : "List<DetectorModelSummary>",
+            "variableSetterType" : "java.util.Collection<DetectorModelSummary>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Summary information about the detector models.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorModelSummaries(java.util.Collection)} or {@link #withDetectorModelSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorModelSummaries Summary information about the detector models.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorModelSummary>",
+            "variableName" : "detectorModelSummaries",
+            "variableType" : "java.util.List<DetectorModelSummary>",
+            "documentation" : "<p>Summary information about the detector models.</p>",
+            "simpleType" : "List<DetectorModelSummary>",
+            "variableSetterType" : "java.util.Collection<DetectorModelSummary>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListDetectorModelsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorModelsResult",
+        "variableName" : "listDetectorModelsResult",
+        "variableType" : "ListDetectorModelsResult",
+        "documentation" : null,
+        "simpleType" : "ListDetectorModelsResult",
+        "variableSetterType" : "ListDetectorModelsResult"
+      },
+      "wrapper" : false
+    },
+    "ListInputsRequest" : {
+      "c2jName" : "ListInputsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListInputs",
+        "locationName" : null,
+        "requestUri" : "/inputs",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>The token for the next set of results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "maxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "<p>The maximum number of results to return at one time.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "MaxResults" : {
+          "c2jName" : "maxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "<p>The maximum number of results to return at one time.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>The token for the next set of results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListInputsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListInputsRequest",
+        "variableName" : "listInputsRequest",
+        "variableType" : "ListInputsRequest",
+        "documentation" : null,
+        "simpleType" : "ListInputsRequest",
+        "variableSetterType" : "ListInputsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListInputsResult" : {
+      "c2jName" : "ListInputsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "inputSummaries",
+        "c2jShape" : "InputSummaries",
+        "deprecated" : false,
+        "documentation" : "<p>Summary information about the inputs.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Summary information about the inputs.</p>\n@param inputSummaries Summary information about the inputs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputSummaries",
+        "getterDocumentation" : "/**<p>Summary information about the inputs.</p>\n@return Summary information about the inputs.*/",
+        "getterMethodName" : "getInputSummaries",
+        "getterModel" : {
+          "returnType" : "java.util.List<InputSummary>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputSummaries",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputSummaries",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "InputSummary",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "InputSummary",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "InputSummary",
+              "variableName" : "member",
+              "variableType" : "InputSummary",
+              "documentation" : "",
+              "simpleType" : "InputSummary",
+              "variableSetterType" : "InputSummary"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "InputSummary",
+              "variableName" : "member",
+              "variableType" : "InputSummary",
+              "documentation" : "",
+              "simpleType" : "InputSummary",
+              "variableSetterType" : "InputSummary"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "InputSummary",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "InputSummary",
+          "templateImplType" : "java.util.ArrayList<InputSummary>",
+          "templateType" : "java.util.List<InputSummary>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "InputSummaries",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Summary information about the inputs.</p>\n@param inputSummaries Summary information about the inputs.*/",
+        "setterMethodName" : "setInputSummaries",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<InputSummary>",
+          "variableName" : "inputSummaries",
+          "variableType" : "java.util.List<InputSummary>",
+          "documentation" : "",
+          "simpleType" : "List<InputSummary>",
+          "variableSetterType" : "java.util.Collection<InputSummary>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Summary information about the inputs.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setInputSummaries(java.util.Collection)} or {@link #withInputSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param inputSummaries Summary information about the inputs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<InputSummary>",
+          "variableName" : "inputSummaries",
+          "variableType" : "java.util.List<InputSummary>",
+          "documentation" : "<p>Summary information about the inputs.</p>",
+          "simpleType" : "List<InputSummary>",
+          "variableSetterType" : "java.util.Collection<InputSummary>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputSummaries" : {
+          "c2jName" : "inputSummaries",
+          "c2jShape" : "InputSummaries",
+          "deprecated" : false,
+          "documentation" : "<p>Summary information about the inputs.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Summary information about the inputs.</p>\n@param inputSummaries Summary information about the inputs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputSummaries",
+          "getterDocumentation" : "/**<p>Summary information about the inputs.</p>\n@return Summary information about the inputs.*/",
+          "getterMethodName" : "getInputSummaries",
+          "getterModel" : {
+            "returnType" : "java.util.List<InputSummary>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputSummaries",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputSummaries",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "InputSummary",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "InputSummary",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "InputSummary",
+                "variableName" : "member",
+                "variableType" : "InputSummary",
+                "documentation" : "",
+                "simpleType" : "InputSummary",
+                "variableSetterType" : "InputSummary"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "InputSummary",
+                "variableName" : "member",
+                "variableType" : "InputSummary",
+                "documentation" : "",
+                "simpleType" : "InputSummary",
+                "variableSetterType" : "InputSummary"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "InputSummary",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "InputSummary",
+            "templateImplType" : "java.util.ArrayList<InputSummary>",
+            "templateType" : "java.util.List<InputSummary>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "InputSummaries",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Summary information about the inputs.</p>\n@param inputSummaries Summary information about the inputs.*/",
+          "setterMethodName" : "setInputSummaries",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<InputSummary>",
+            "variableName" : "inputSummaries",
+            "variableType" : "java.util.List<InputSummary>",
+            "documentation" : "",
+            "simpleType" : "List<InputSummary>",
+            "variableSetterType" : "java.util.Collection<InputSummary>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Summary information about the inputs.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setInputSummaries(java.util.Collection)} or {@link #withInputSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param inputSummaries Summary information about the inputs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<InputSummary>",
+            "variableName" : "inputSummaries",
+            "variableType" : "java.util.List<InputSummary>",
+            "documentation" : "<p>Summary information about the inputs.</p>",
+            "simpleType" : "List<InputSummary>",
+            "variableSetterType" : "java.util.Collection<InputSummary>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListInputsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListInputsResult",
+        "variableName" : "listInputsResult",
+        "variableType" : "ListInputsResult",
+        "documentation" : null,
+        "simpleType" : "ListInputsResult",
+        "variableSetterType" : "ListInputsResult"
+      },
+      "wrapper" : false
+    },
+    "ListTagsForResourceRequest" : {
+      "c2jName" : "ListTagsForResourceRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListTagsForResource",
+        "locationName" : null,
+        "requestUri" : "/tags",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the resource.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn" ],
+      "shapeName" : "ListTagsForResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListTagsForResourceRequest",
+        "variableName" : "listTagsForResourceRequest",
+        "variableType" : "ListTagsForResourceRequest",
+        "documentation" : null,
+        "simpleType" : "ListTagsForResourceRequest",
+        "variableSetterType" : "ListTagsForResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "ListTagsForResourceResult" : {
+      "c2jName" : "ListTagsForResourceResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "tags",
+        "c2jShape" : "Tags",
+        "deprecated" : false,
+        "documentation" : "<p>The list of tags assigned to the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n@param tags The list of tags assigned to the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n@return The list of tags assigned to the resource.*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.List<Tag>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Tag",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Tag",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Tag",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Tag",
+          "templateImplType" : "java.util.ArrayList<Tag>",
+          "templateType" : "java.util.List<Tag>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n@param tags The list of tags assigned to the resource.*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags The list of tags assigned to the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "<p>The list of tags assigned to the resource.</p>",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "Tags",
+          "deprecated" : false,
+          "documentation" : "<p>The list of tags assigned to the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n@param tags The list of tags assigned to the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n@return The list of tags assigned to the resource.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.List<Tag>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Tag",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Tag",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Tag",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Tag",
+            "templateImplType" : "java.util.ArrayList<Tag>",
+            "templateType" : "java.util.List<Tag>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n@param tags The list of tags assigned to the resource.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The list of tags assigned to the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags The list of tags assigned to the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "<p>The list of tags assigned to the resource.</p>",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListTagsForResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListTagsForResourceResult",
+        "variableName" : "listTagsForResourceResult",
+        "variableType" : "ListTagsForResourceResult",
+        "documentation" : null,
+        "simpleType" : "ListTagsForResourceResult",
+        "variableSetterType" : "ListTagsForResourceResult"
+      },
+      "wrapper" : false
+    },
+    "LoggingLevel" : {
+      "c2jName" : "LoggingLevel",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "ERROR",
+        "value" : "ERROR"
+      }, {
+        "name" : "INFO",
+        "value" : "INFO"
+      }, {
+        "name" : "DEBUG",
+        "value" : "DEBUG"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "LoggingLevel",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "LoggingLevel",
+        "variableName" : "loggingLevel",
+        "variableType" : "LoggingLevel",
+        "documentation" : null,
+        "simpleType" : "LoggingLevel",
+        "variableSetterType" : "LoggingLevel"
+      },
+      "wrapper" : false
+    },
+    "LoggingOptions" : {
+      "c2jName" : "LoggingOptions",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The values of the AWS IoT Events logging options.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "roleArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform logging.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform logging.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform logging.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform logging.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "level",
+        "c2jShape" : "LoggingLevel",
+        "deprecated" : false,
+        "documentation" : "<p>The logging level. Currently, only \"ERROR\" is supported.</p>",
+        "enumType" : "LoggingLevel",
+        "fluentSetterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@param level The logging level. Currently, only \"ERROR\" is supported.\n@return Returns a reference to this object so that method calls can be chained together.\n@see LoggingLevel*/",
+        "fluentSetterMethodName" : "withLevel",
+        "getterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@return The logging level. Currently, only \"ERROR\" is supported.\n@see LoggingLevel*/",
+        "getterMethodName" : "getLevel",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "level",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "level",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Level",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@param level The logging level. Currently, only \"ERROR\" is supported.\n@see LoggingLevel*/",
+        "setterMethodName" : "setLevel",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "level",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@param level The logging level. Currently, only \"ERROR\" is supported.\n@return Returns a reference to this object so that method calls can be chained together.\n@see LoggingLevel*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "level",
+          "variableType" : "String",
+          "documentation" : "<p>The logging level. Currently, only \"ERROR\" is supported.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "enabled",
+        "c2jShape" : "LoggingEnabled",
+        "deprecated" : false,
+        "documentation" : "<p>If TRUE, logging is enabled for AWS IoT Events.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@param enabled If TRUE, logging is enabled for AWS IoT Events.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEnabled",
+        "getterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@return If TRUE, logging is enabled for AWS IoT Events.*/",
+        "getterMethodName" : "getEnabled",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "enabled",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "enabled",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "Enabled",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@param enabled If TRUE, logging is enabled for AWS IoT Events.*/",
+        "setterMethodName" : "setEnabled",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "enabled",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@param enabled If TRUE, logging is enabled for AWS IoT Events.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "enabled",
+          "variableType" : "Boolean",
+          "documentation" : "<p>If TRUE, logging is enabled for AWS IoT Events.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorDebugOptions",
+        "c2jShape" : "DetectorDebugOptions",
+        "deprecated" : false,
+        "documentation" : "<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n@param detectorDebugOptions Information that identifies those detector models and their detectors (instances) for which the logging level is given.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorDebugOptions",
+        "getterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n@return Information that identifies those detector models and their detectors (instances) for which the logging level is given.*/",
+        "getterMethodName" : "getDetectorDebugOptions",
+        "getterModel" : {
+          "returnType" : "java.util.List<DetectorDebugOption>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorDebugOptions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorDebugOptions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "DetectorDebugOption",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "DetectorDebugOption",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorDebugOption",
+              "variableName" : "member",
+              "variableType" : "DetectorDebugOption",
+              "documentation" : "",
+              "simpleType" : "DetectorDebugOption",
+              "variableSetterType" : "DetectorDebugOption"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorDebugOption",
+              "variableName" : "member",
+              "variableType" : "DetectorDebugOption",
+              "documentation" : "",
+              "simpleType" : "DetectorDebugOption",
+              "variableSetterType" : "DetectorDebugOption"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "DetectorDebugOption",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "DetectorDebugOption",
+          "templateImplType" : "java.util.ArrayList<DetectorDebugOption>",
+          "templateType" : "java.util.List<DetectorDebugOption>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "DetectorDebugOptions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n@param detectorDebugOptions Information that identifies those detector models and their detectors (instances) for which the logging level is given.*/",
+        "setterMethodName" : "setDetectorDebugOptions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorDebugOption>",
+          "variableName" : "detectorDebugOptions",
+          "variableType" : "java.util.List<DetectorDebugOption>",
+          "documentation" : "",
+          "simpleType" : "List<DetectorDebugOption>",
+          "variableSetterType" : "java.util.Collection<DetectorDebugOption>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorDebugOptions(java.util.Collection)} or {@link #withDetectorDebugOptions(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorDebugOptions Information that identifies those detector models and their detectors (instances) for which the logging level is given.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorDebugOption>",
+          "variableName" : "detectorDebugOptions",
+          "variableType" : "java.util.List<DetectorDebugOption>",
+          "documentation" : "<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>",
+          "simpleType" : "List<DetectorDebugOption>",
+          "variableSetterType" : "java.util.Collection<DetectorDebugOption>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorDebugOptions" : {
+          "c2jName" : "detectorDebugOptions",
+          "c2jShape" : "DetectorDebugOptions",
+          "deprecated" : false,
+          "documentation" : "<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n@param detectorDebugOptions Information that identifies those detector models and their detectors (instances) for which the logging level is given.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorDebugOptions",
+          "getterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n@return Information that identifies those detector models and their detectors (instances) for which the logging level is given.*/",
+          "getterMethodName" : "getDetectorDebugOptions",
+          "getterModel" : {
+            "returnType" : "java.util.List<DetectorDebugOption>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorDebugOptions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorDebugOptions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "DetectorDebugOption",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "DetectorDebugOption",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorDebugOption",
+                "variableName" : "member",
+                "variableType" : "DetectorDebugOption",
+                "documentation" : "",
+                "simpleType" : "DetectorDebugOption",
+                "variableSetterType" : "DetectorDebugOption"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorDebugOption",
+                "variableName" : "member",
+                "variableType" : "DetectorDebugOption",
+                "documentation" : "",
+                "simpleType" : "DetectorDebugOption",
+                "variableSetterType" : "DetectorDebugOption"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "DetectorDebugOption",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "DetectorDebugOption",
+            "templateImplType" : "java.util.ArrayList<DetectorDebugOption>",
+            "templateType" : "java.util.List<DetectorDebugOption>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "DetectorDebugOptions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n@param detectorDebugOptions Information that identifies those detector models and their detectors (instances) for which the logging level is given.*/",
+          "setterMethodName" : "setDetectorDebugOptions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorDebugOption>",
+            "variableName" : "detectorDebugOptions",
+            "variableType" : "java.util.List<DetectorDebugOption>",
+            "documentation" : "",
+            "simpleType" : "List<DetectorDebugOption>",
+            "variableSetterType" : "java.util.Collection<DetectorDebugOption>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorDebugOptions(java.util.Collection)} or {@link #withDetectorDebugOptions(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorDebugOptions Information that identifies those detector models and their detectors (instances) for which the logging level is given.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorDebugOption>",
+            "variableName" : "detectorDebugOptions",
+            "variableType" : "java.util.List<DetectorDebugOption>",
+            "documentation" : "<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>",
+            "simpleType" : "List<DetectorDebugOption>",
+            "variableSetterType" : "java.util.Collection<DetectorDebugOption>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Enabled" : {
+          "c2jName" : "enabled",
+          "c2jShape" : "LoggingEnabled",
+          "deprecated" : false,
+          "documentation" : "<p>If TRUE, logging is enabled for AWS IoT Events.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@param enabled If TRUE, logging is enabled for AWS IoT Events.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEnabled",
+          "getterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@return If TRUE, logging is enabled for AWS IoT Events.*/",
+          "getterMethodName" : "getEnabled",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "enabled",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "enabled",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "Enabled",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@param enabled If TRUE, logging is enabled for AWS IoT Events.*/",
+          "setterMethodName" : "setEnabled",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "enabled",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>If TRUE, logging is enabled for AWS IoT Events.</p>\n@param enabled If TRUE, logging is enabled for AWS IoT Events.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "enabled",
+            "variableType" : "Boolean",
+            "documentation" : "<p>If TRUE, logging is enabled for AWS IoT Events.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Level" : {
+          "c2jName" : "level",
+          "c2jShape" : "LoggingLevel",
+          "deprecated" : false,
+          "documentation" : "<p>The logging level. Currently, only \"ERROR\" is supported.</p>",
+          "enumType" : "LoggingLevel",
+          "fluentSetterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@param level The logging level. Currently, only \"ERROR\" is supported.\n@return Returns a reference to this object so that method calls can be chained together.\n@see LoggingLevel*/",
+          "fluentSetterMethodName" : "withLevel",
+          "getterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@return The logging level. Currently, only \"ERROR\" is supported.\n@see LoggingLevel*/",
+          "getterMethodName" : "getLevel",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "level",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "level",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Level",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@param level The logging level. Currently, only \"ERROR\" is supported.\n@see LoggingLevel*/",
+          "setterMethodName" : "setLevel",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "level",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The logging level. Currently, only \"ERROR\" is supported.</p>\n@param level The logging level. Currently, only \"ERROR\" is supported.\n@return Returns a reference to this object so that method calls can be chained together.\n@see LoggingLevel*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "level",
+            "variableType" : "String",
+            "documentation" : "<p>The logging level. Currently, only \"ERROR\" is supported.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform logging.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform logging.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform logging.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform logging.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "roleArn", "level", "enabled" ],
+      "shapeName" : "LoggingOptions",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "LoggingOptions",
+        "variableName" : "loggingOptions",
+        "variableType" : "LoggingOptions",
+        "documentation" : null,
+        "simpleType" : "LoggingOptions",
+        "variableSetterType" : "LoggingOptions"
+      },
+      "wrapper" : false
+    },
+    "OnEnterLifecycle" : {
+      "c2jName" : "OnEnterLifecycle",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "events",
+        "c2jShape" : "Events",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEvents",
+        "getterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n@return Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.*/",
+        "getterMethodName" : "getEvents",
+        "getterModel" : {
+          "returnType" : "java.util.List<Event>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "events",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "events",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Event",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Event",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Event",
+              "variableName" : "member",
+              "variableType" : "Event",
+              "documentation" : "",
+              "simpleType" : "Event",
+              "variableSetterType" : "Event"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Event",
+              "variableName" : "member",
+              "variableType" : "Event",
+              "documentation" : "",
+              "simpleType" : "Event",
+              "variableSetterType" : "Event"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Event",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Event",
+          "templateImplType" : "java.util.ArrayList<Event>",
+          "templateType" : "java.util.List<Event>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Events",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.*/",
+        "setterMethodName" : "setEvents",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Event>",
+          "variableName" : "events",
+          "variableType" : "java.util.List<Event>",
+          "documentation" : "",
+          "simpleType" : "List<Event>",
+          "variableSetterType" : "java.util.Collection<Event>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param events Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Event>",
+          "variableName" : "events",
+          "variableType" : "java.util.List<Event>",
+          "documentation" : "<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>",
+          "simpleType" : "List<Event>",
+          "variableSetterType" : "java.util.Collection<Event>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Events" : {
+          "c2jName" : "events",
+          "c2jShape" : "Events",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEvents",
+          "getterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n@return Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.*/",
+          "getterMethodName" : "getEvents",
+          "getterModel" : {
+            "returnType" : "java.util.List<Event>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "events",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "events",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Event",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Event",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Event",
+                "variableName" : "member",
+                "variableType" : "Event",
+                "documentation" : "",
+                "simpleType" : "Event",
+                "variableSetterType" : "Event"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Event",
+                "variableName" : "member",
+                "variableType" : "Event",
+                "documentation" : "",
+                "simpleType" : "Event",
+                "variableSetterType" : "Event"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Event",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Event",
+            "templateImplType" : "java.util.ArrayList<Event>",
+            "templateType" : "java.util.List<Event>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Events",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.*/",
+          "setterMethodName" : "setEvents",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Event>",
+            "variableName" : "events",
+            "variableType" : "java.util.List<Event>",
+            "documentation" : "",
+            "simpleType" : "List<Event>",
+            "variableSetterType" : "java.util.Collection<Event>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param events Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Event>",
+            "variableName" : "events",
+            "variableType" : "java.util.List<Event>",
+            "documentation" : "<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>",
+            "simpleType" : "List<Event>",
+            "variableSetterType" : "java.util.Collection<Event>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "OnEnterLifecycle",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "OnEnterLifecycle",
+        "variableName" : "onEnterLifecycle",
+        "variableType" : "OnEnterLifecycle",
+        "documentation" : null,
+        "simpleType" : "OnEnterLifecycle",
+        "variableSetterType" : "OnEnterLifecycle"
+      },
+      "wrapper" : false
+    },
+    "OnExitLifecycle" : {
+      "c2jName" : "OnExitLifecycle",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "events",
+        "c2jShape" : "Events",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEvents",
+        "getterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n@return Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.*/",
+        "getterMethodName" : "getEvents",
+        "getterModel" : {
+          "returnType" : "java.util.List<Event>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "events",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "events",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Event",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Event",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Event",
+              "variableName" : "member",
+              "variableType" : "Event",
+              "documentation" : "",
+              "simpleType" : "Event",
+              "variableSetterType" : "Event"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Event",
+              "variableName" : "member",
+              "variableType" : "Event",
+              "documentation" : "",
+              "simpleType" : "Event",
+              "variableSetterType" : "Event"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Event",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Event",
+          "templateImplType" : "java.util.ArrayList<Event>",
+          "templateType" : "java.util.List<Event>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Events",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.*/",
+        "setterMethodName" : "setEvents",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Event>",
+          "variableName" : "events",
+          "variableType" : "java.util.List<Event>",
+          "documentation" : "",
+          "simpleType" : "List<Event>",
+          "variableSetterType" : "java.util.Collection<Event>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param events Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Event>",
+          "variableName" : "events",
+          "variableType" : "java.util.List<Event>",
+          "documentation" : "<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>",
+          "simpleType" : "List<Event>",
+          "variableSetterType" : "java.util.Collection<Event>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Events" : {
+          "c2jName" : "events",
+          "c2jShape" : "Events",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEvents",
+          "getterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n@return Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.*/",
+          "getterMethodName" : "getEvents",
+          "getterModel" : {
+            "returnType" : "java.util.List<Event>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "events",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "events",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Event",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Event",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Event",
+                "variableName" : "member",
+                "variableType" : "Event",
+                "documentation" : "",
+                "simpleType" : "Event",
+                "variableSetterType" : "Event"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Event",
+                "variableName" : "member",
+                "variableType" : "Event",
+                "documentation" : "",
+                "simpleType" : "Event",
+                "variableSetterType" : "Event"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Event",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Event",
+            "templateImplType" : "java.util.ArrayList<Event>",
+            "templateType" : "java.util.List<Event>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Events",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n@param events Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.*/",
+          "setterMethodName" : "setEvents",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Event>",
+            "variableName" : "events",
+            "variableType" : "java.util.List<Event>",
+            "documentation" : "",
+            "simpleType" : "List<Event>",
+            "variableSetterType" : "java.util.Collection<Event>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param events Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Event>",
+            "variableName" : "events",
+            "variableType" : "java.util.List<Event>",
+            "documentation" : "<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>",
+            "simpleType" : "List<Event>",
+            "variableSetterType" : "java.util.Collection<Event>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "OnExitLifecycle",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "OnExitLifecycle",
+        "variableName" : "onExitLifecycle",
+        "variableType" : "OnExitLifecycle",
+        "documentation" : null,
+        "simpleType" : "OnExitLifecycle",
+        "variableSetterType" : "OnExitLifecycle"
+      },
+      "wrapper" : false
+    },
+    "OnInputLifecycle" : {
+      "c2jName" : "OnInputLifecycle",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "events",
+        "c2jShape" : "Events",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n@param events Specifies the actions performed when the <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEvents",
+        "getterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n@return Specifies the actions performed when the <code>condition</code> evaluates to TRUE.*/",
+        "getterMethodName" : "getEvents",
+        "getterModel" : {
+          "returnType" : "java.util.List<Event>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "events",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "events",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Event",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Event",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Event",
+              "variableName" : "member",
+              "variableType" : "Event",
+              "documentation" : "",
+              "simpleType" : "Event",
+              "variableSetterType" : "Event"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Event",
+              "variableName" : "member",
+              "variableType" : "Event",
+              "documentation" : "",
+              "simpleType" : "Event",
+              "variableSetterType" : "Event"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Event",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Event",
+          "templateImplType" : "java.util.ArrayList<Event>",
+          "templateType" : "java.util.List<Event>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Events",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n@param events Specifies the actions performed when the <code>condition</code> evaluates to TRUE.*/",
+        "setterMethodName" : "setEvents",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Event>",
+          "variableName" : "events",
+          "variableType" : "java.util.List<Event>",
+          "documentation" : "",
+          "simpleType" : "List<Event>",
+          "variableSetterType" : "java.util.Collection<Event>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param events Specifies the actions performed when the <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Event>",
+          "variableName" : "events",
+          "variableType" : "java.util.List<Event>",
+          "documentation" : "<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>",
+          "simpleType" : "List<Event>",
+          "variableSetterType" : "java.util.Collection<Event>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "transitionEvents",
+        "c2jShape" : "TransitionEvents",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n@param transitionEvents Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransitionEvents",
+        "getterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n@return Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.*/",
+        "getterMethodName" : "getTransitionEvents",
+        "getterModel" : {
+          "returnType" : "java.util.List<TransitionEvent>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "transitionEvents",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "transitionEvents",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "TransitionEvent",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "TransitionEvent",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "TransitionEvent",
+              "variableName" : "member",
+              "variableType" : "TransitionEvent",
+              "documentation" : "",
+              "simpleType" : "TransitionEvent",
+              "variableSetterType" : "TransitionEvent"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "TransitionEvent",
+              "variableName" : "member",
+              "variableType" : "TransitionEvent",
+              "documentation" : "",
+              "simpleType" : "TransitionEvent",
+              "variableSetterType" : "TransitionEvent"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "TransitionEvent",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "TransitionEvent",
+          "templateImplType" : "java.util.ArrayList<TransitionEvent>",
+          "templateType" : "java.util.List<TransitionEvent>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "TransitionEvents",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n@param transitionEvents Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.*/",
+        "setterMethodName" : "setTransitionEvents",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<TransitionEvent>",
+          "variableName" : "transitionEvents",
+          "variableType" : "java.util.List<TransitionEvent>",
+          "documentation" : "",
+          "simpleType" : "List<TransitionEvent>",
+          "variableSetterType" : "java.util.Collection<TransitionEvent>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTransitionEvents(java.util.Collection)} or {@link #withTransitionEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param transitionEvents Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<TransitionEvent>",
+          "variableName" : "transitionEvents",
+          "variableType" : "java.util.List<TransitionEvent>",
+          "documentation" : "<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>",
+          "simpleType" : "List<TransitionEvent>",
+          "variableSetterType" : "java.util.Collection<TransitionEvent>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Events" : {
+          "c2jName" : "events",
+          "c2jShape" : "Events",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n@param events Specifies the actions performed when the <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEvents",
+          "getterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n@return Specifies the actions performed when the <code>condition</code> evaluates to TRUE.*/",
+          "getterMethodName" : "getEvents",
+          "getterModel" : {
+            "returnType" : "java.util.List<Event>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "events",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "events",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Event",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Event",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Event",
+                "variableName" : "member",
+                "variableType" : "Event",
+                "documentation" : "",
+                "simpleType" : "Event",
+                "variableSetterType" : "Event"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Event",
+                "variableName" : "member",
+                "variableType" : "Event",
+                "documentation" : "",
+                "simpleType" : "Event",
+                "variableSetterType" : "Event"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Event",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Event",
+            "templateImplType" : "java.util.ArrayList<Event>",
+            "templateType" : "java.util.List<Event>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Events",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n@param events Specifies the actions performed when the <code>condition</code> evaluates to TRUE.*/",
+          "setterMethodName" : "setEvents",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Event>",
+            "variableName" : "events",
+            "variableType" : "java.util.List<Event>",
+            "documentation" : "",
+            "simpleType" : "List<Event>",
+            "variableSetterType" : "java.util.Collection<Event>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEvents(java.util.Collection)} or {@link #withEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param events Specifies the actions performed when the <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Event>",
+            "variableName" : "events",
+            "variableType" : "java.util.List<Event>",
+            "documentation" : "<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>",
+            "simpleType" : "List<Event>",
+            "variableSetterType" : "java.util.Collection<Event>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TransitionEvents" : {
+          "c2jName" : "transitionEvents",
+          "c2jShape" : "TransitionEvents",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n@param transitionEvents Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransitionEvents",
+          "getterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n@return Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.*/",
+          "getterMethodName" : "getTransitionEvents",
+          "getterModel" : {
+            "returnType" : "java.util.List<TransitionEvent>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transitionEvents",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transitionEvents",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "TransitionEvent",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "TransitionEvent",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "TransitionEvent",
+                "variableName" : "member",
+                "variableType" : "TransitionEvent",
+                "documentation" : "",
+                "simpleType" : "TransitionEvent",
+                "variableSetterType" : "TransitionEvent"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "TransitionEvent",
+                "variableName" : "member",
+                "variableType" : "TransitionEvent",
+                "documentation" : "",
+                "simpleType" : "TransitionEvent",
+                "variableSetterType" : "TransitionEvent"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "TransitionEvent",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "TransitionEvent",
+            "templateImplType" : "java.util.ArrayList<TransitionEvent>",
+            "templateType" : "java.util.List<TransitionEvent>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "TransitionEvents",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n@param transitionEvents Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.*/",
+          "setterMethodName" : "setTransitionEvents",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<TransitionEvent>",
+            "variableName" : "transitionEvents",
+            "variableType" : "java.util.List<TransitionEvent>",
+            "documentation" : "",
+            "simpleType" : "List<TransitionEvent>",
+            "variableSetterType" : "java.util.Collection<TransitionEvent>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTransitionEvents(java.util.Collection)} or {@link #withTransitionEvents(java.util.Collection)} if you want to override the existing values.</p>\n@param transitionEvents Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<TransitionEvent>",
+            "variableName" : "transitionEvents",
+            "variableType" : "java.util.List<TransitionEvent>",
+            "documentation" : "<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>",
+            "simpleType" : "List<TransitionEvent>",
+            "variableSetterType" : "java.util.Collection<TransitionEvent>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "OnInputLifecycle",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "OnInputLifecycle",
+        "variableName" : "onInputLifecycle",
+        "variableType" : "OnInputLifecycle",
+        "documentation" : null,
+        "simpleType" : "OnInputLifecycle",
+        "variableSetterType" : "OnInputLifecycle"
+      },
+      "wrapper" : false
+    },
+    "PutLoggingOptionsRequest" : {
+      "c2jName" : "PutLoggingOptionsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "PutLoggingOptions",
+        "locationName" : null,
+        "requestUri" : "/logging",
+        "target" : null,
+        "verb" : "PUT",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "loggingOptions",
+        "c2jShape" : "LoggingOptions",
+        "deprecated" : false,
+        "documentation" : "<p>The new values of the AWS IoT Events logging options.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@param loggingOptions The new values of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLoggingOptions",
+        "getterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@return The new values of the AWS IoT Events logging options.*/",
+        "getterMethodName" : "getLoggingOptions",
+        "getterModel" : {
+          "returnType" : "LoggingOptions",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "loggingOptions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "loggingOptions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "LoggingOptions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@param loggingOptions The new values of the AWS IoT Events logging options.*/",
+        "setterMethodName" : "setLoggingOptions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "LoggingOptions",
+          "variableName" : "loggingOptions",
+          "variableType" : "LoggingOptions",
+          "documentation" : "",
+          "simpleType" : "LoggingOptions",
+          "variableSetterType" : "LoggingOptions"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@param loggingOptions The new values of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "LoggingOptions",
+          "variableName" : "loggingOptions",
+          "variableType" : "LoggingOptions",
+          "documentation" : "<p>The new values of the AWS IoT Events logging options.</p>",
+          "simpleType" : "LoggingOptions",
+          "variableSetterType" : "LoggingOptions"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "LoggingOptions" : {
+          "c2jName" : "loggingOptions",
+          "c2jShape" : "LoggingOptions",
+          "deprecated" : false,
+          "documentation" : "<p>The new values of the AWS IoT Events logging options.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@param loggingOptions The new values of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLoggingOptions",
+          "getterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@return The new values of the AWS IoT Events logging options.*/",
+          "getterMethodName" : "getLoggingOptions",
+          "getterModel" : {
+            "returnType" : "LoggingOptions",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "loggingOptions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "loggingOptions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "LoggingOptions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@param loggingOptions The new values of the AWS IoT Events logging options.*/",
+          "setterMethodName" : "setLoggingOptions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "LoggingOptions",
+            "variableName" : "loggingOptions",
+            "variableType" : "LoggingOptions",
+            "documentation" : "",
+            "simpleType" : "LoggingOptions",
+            "variableSetterType" : "LoggingOptions"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new values of the AWS IoT Events logging options.</p>\n@param loggingOptions The new values of the AWS IoT Events logging options.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "LoggingOptions",
+            "variableName" : "loggingOptions",
+            "variableType" : "LoggingOptions",
+            "documentation" : "<p>The new values of the AWS IoT Events logging options.</p>",
+            "simpleType" : "LoggingOptions",
+            "variableSetterType" : "LoggingOptions"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "loggingOptions" ],
+      "shapeName" : "PutLoggingOptionsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "PutLoggingOptionsRequest",
+        "variableName" : "putLoggingOptionsRequest",
+        "variableType" : "PutLoggingOptionsRequest",
+        "documentation" : null,
+        "simpleType" : "PutLoggingOptionsRequest",
+        "variableSetterType" : "PutLoggingOptionsRequest"
+      },
+      "wrapper" : false
+    },
+    "PutLoggingOptionsResult" : {
+      "c2jName" : "PutLoggingOptionsResult",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : null,
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "PutLoggingOptionsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "PutLoggingOptionsResult",
+        "variableName" : "putLoggingOptionsResult",
+        "variableType" : "PutLoggingOptionsResult",
+        "documentation" : null,
+        "simpleType" : "PutLoggingOptionsResult",
+        "variableSetterType" : "PutLoggingOptionsResult"
+      },
+      "wrapper" : false
+    },
+    "ResetTimerAction" : {
+      "c2jName" : "ResetTimerAction",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information needed to reset the timer.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "timerName",
+        "c2jShape" : "TimerName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the timer to reset.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@param timerName The name of the timer to reset.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTimerName",
+        "getterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@return The name of the timer to reset.*/",
+        "getterMethodName" : "getTimerName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "timerName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "timerName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TimerName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@param timerName The name of the timer to reset.*/",
+        "setterMethodName" : "setTimerName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "timerName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@param timerName The name of the timer to reset.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "timerName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the timer to reset.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "TimerName" : {
+          "c2jName" : "timerName",
+          "c2jShape" : "TimerName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the timer to reset.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@param timerName The name of the timer to reset.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTimerName",
+          "getterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@return The name of the timer to reset.*/",
+          "getterMethodName" : "getTimerName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "timerName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "timerName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TimerName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@param timerName The name of the timer to reset.*/",
+          "setterMethodName" : "setTimerName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "timerName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the timer to reset.</p>\n@param timerName The name of the timer to reset.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "timerName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the timer to reset.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "timerName" ],
+      "shapeName" : "ResetTimerAction",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ResetTimerAction",
+        "variableName" : "resetTimerAction",
+        "variableType" : "ResetTimerAction",
+        "documentation" : null,
+        "simpleType" : "ResetTimerAction",
+        "variableSetterType" : "ResetTimerAction"
+      },
+      "wrapper" : false
+    },
+    "ResourceAlreadyExistsException" : {
+      "c2jName" : "ResourceAlreadyExistsException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The resource already exists.</p>",
+      "enums" : null,
+      "errorCode" : "ResourceAlreadyExistsException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "resourceId",
+        "c2jShape" : "resourceId",
+        "deprecated" : false,
+        "documentation" : "<p>The ID of the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ID of the resource.</p>\n@param resourceId The ID of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceId",
+        "getterDocumentation" : "/**<p>The ID of the resource.</p>\n@return The ID of the resource.*/",
+        "getterMethodName" : "getResourceId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ID of the resource.</p>\n@param resourceId The ID of the resource.*/",
+        "setterMethodName" : "setResourceId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ID of the resource.</p>\n@param resourceId The ID of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceId",
+          "variableType" : "String",
+          "documentation" : "<p>The ID of the resource.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "resourceArn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "resourceArn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the resource.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResourceId" : {
+          "c2jName" : "resourceId",
+          "c2jShape" : "resourceId",
+          "deprecated" : false,
+          "documentation" : "<p>The ID of the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ID of the resource.</p>\n@param resourceId The ID of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceId",
+          "getterDocumentation" : "/**<p>The ID of the resource.</p>\n@return The ID of the resource.*/",
+          "getterMethodName" : "getResourceId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ID of the resource.</p>\n@param resourceId The ID of the resource.*/",
+          "setterMethodName" : "setResourceId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ID of the resource.</p>\n@param resourceId The ID of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceId",
+            "variableType" : "String",
+            "documentation" : "<p>The ID of the resource.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ResourceAlreadyExistsException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ResourceAlreadyExistsException",
+        "variableName" : "resourceAlreadyExistsException",
+        "variableType" : "ResourceAlreadyExistsException",
+        "documentation" : null,
+        "simpleType" : "ResourceAlreadyExistsException",
+        "variableSetterType" : "ResourceAlreadyExistsException"
+      },
+      "wrapper" : false
+    },
+    "ResourceInUseException" : {
+      "c2jName" : "ResourceInUseException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The resource is in use.</p>",
+      "enums" : null,
+      "errorCode" : "ResourceInUseException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ResourceInUseException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ResourceInUseException",
+        "variableName" : "resourceInUseException",
+        "variableType" : "ResourceInUseException",
+        "documentation" : null,
+        "simpleType" : "ResourceInUseException",
+        "variableSetterType" : "ResourceInUseException"
+      },
+      "wrapper" : false
+    },
+    "ResourceNotFoundException" : {
+      "c2jName" : "ResourceNotFoundException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The resource was not found.</p>",
+      "enums" : null,
+      "errorCode" : "ResourceNotFoundException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ResourceNotFoundException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ResourceNotFoundException",
+        "variableName" : "resourceNotFoundException",
+        "variableType" : "ResourceNotFoundException",
+        "documentation" : null,
+        "simpleType" : "ResourceNotFoundException",
+        "variableSetterType" : "ResourceNotFoundException"
+      },
+      "wrapper" : false
+    },
+    "SNSTopicPublishAction" : {
+      "c2jName" : "SNSTopicPublishAction",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information required to publish the Amazon SNS message.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "targetArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the Amazon SNS target to which the message is sent.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@param targetArn The ARN of the Amazon SNS target to which the message is sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTargetArn",
+        "getterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@return The ARN of the Amazon SNS target to which the message is sent.*/",
+        "getterMethodName" : "getTargetArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "targetArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "targetArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TargetArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@param targetArn The ARN of the Amazon SNS target to which the message is sent.*/",
+        "setterMethodName" : "setTargetArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "targetArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@param targetArn The ARN of the Amazon SNS target to which the message is sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "targetArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the Amazon SNS target to which the message is sent.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "TargetArn" : {
+          "c2jName" : "targetArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the Amazon SNS target to which the message is sent.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@param targetArn The ARN of the Amazon SNS target to which the message is sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTargetArn",
+          "getterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@return The ARN of the Amazon SNS target to which the message is sent.*/",
+          "getterMethodName" : "getTargetArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "targetArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "targetArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TargetArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@param targetArn The ARN of the Amazon SNS target to which the message is sent.*/",
+          "setterMethodName" : "setTargetArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "targetArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the Amazon SNS target to which the message is sent.</p>\n@param targetArn The ARN of the Amazon SNS target to which the message is sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "targetArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the Amazon SNS target to which the message is sent.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "targetArn" ],
+      "shapeName" : "SNSTopicPublishAction",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "SNSTopicPublishAction",
+        "variableName" : "sNSTopicPublishAction",
+        "variableType" : "SNSTopicPublishAction",
+        "documentation" : null,
+        "simpleType" : "SNSTopicPublishAction",
+        "variableSetterType" : "SNSTopicPublishAction"
+      },
+      "wrapper" : false
+    },
+    "ServiceUnavailableException" : {
+      "c2jName" : "ServiceUnavailableException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The service is currently unavailable.</p>",
+      "enums" : null,
+      "errorCode" : "ServiceUnavailableException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceUnavailableException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceUnavailableException",
+        "variableName" : "serviceUnavailableException",
+        "variableType" : "ServiceUnavailableException",
+        "documentation" : null,
+        "simpleType" : "ServiceUnavailableException",
+        "variableSetterType" : "ServiceUnavailableException"
+      },
+      "wrapper" : false
+    },
+    "SetTimerAction" : {
+      "c2jName" : "SetTimerAction",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information needed to set the timer.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "timerName",
+        "c2jShape" : "TimerName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param timerName The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTimerName",
+        "getterDocumentation" : "/**<p>The name of the timer.</p>\n@return The name of the timer.*/",
+        "getterMethodName" : "getTimerName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "timerName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "timerName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TimerName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the timer.</p>\n@param timerName The name of the timer.*/",
+        "setterMethodName" : "setTimerName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "timerName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param timerName The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "timerName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the timer.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "seconds",
+        "c2jShape" : "Seconds",
+        "deprecated" : false,
+        "documentation" : "<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@param seconds The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSeconds",
+        "getterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@return The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.*/",
+        "getterMethodName" : "getSeconds",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "seconds",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "seconds",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "Seconds",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@param seconds The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.*/",
+        "setterMethodName" : "setSeconds",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "seconds",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@param seconds The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "seconds",
+          "variableType" : "Integer",
+          "documentation" : "<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Seconds" : {
+          "c2jName" : "seconds",
+          "c2jShape" : "Seconds",
+          "deprecated" : false,
+          "documentation" : "<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@param seconds The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSeconds",
+          "getterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@return The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.*/",
+          "getterMethodName" : "getSeconds",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "seconds",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "seconds",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "Seconds",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@param seconds The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.*/",
+          "setterMethodName" : "setSeconds",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "seconds",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>\n@param seconds The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "seconds",
+            "variableType" : "Integer",
+            "documentation" : "<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TimerName" : {
+          "c2jName" : "timerName",
+          "c2jShape" : "TimerName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param timerName The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTimerName",
+          "getterDocumentation" : "/**<p>The name of the timer.</p>\n@return The name of the timer.*/",
+          "getterMethodName" : "getTimerName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "timerName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "timerName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TimerName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the timer.</p>\n@param timerName The name of the timer.*/",
+          "setterMethodName" : "setTimerName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "timerName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param timerName The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "timerName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the timer.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "timerName", "seconds" ],
+      "shapeName" : "SetTimerAction",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "SetTimerAction",
+        "variableName" : "setTimerAction",
+        "variableType" : "SetTimerAction",
+        "documentation" : null,
+        "simpleType" : "SetTimerAction",
+        "variableSetterType" : "SetTimerAction"
+      },
+      "wrapper" : false
+    },
+    "SetVariableAction" : {
+      "c2jName" : "SetVariableAction",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the variable and its new value.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "variableName",
+        "c2jShape" : "VariableName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the variable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param variableName The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withVariableName",
+        "getterDocumentation" : "/**<p>The name of the variable.</p>\n@return The name of the variable.*/",
+        "getterMethodName" : "getVariableName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "variableName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "variableName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "VariableName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the variable.</p>\n@param variableName The name of the variable.*/",
+        "setterMethodName" : "setVariableName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "variableName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param variableName The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "variableName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the variable.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "value",
+        "c2jShape" : "VariableValue",
+        "deprecated" : false,
+        "documentation" : "<p>The new value of the variable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withValue",
+        "getterDocumentation" : "/**<p>The new value of the variable.</p>\n@return The new value of the variable.*/",
+        "getterMethodName" : "getValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "value",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "value",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Value",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.*/",
+        "setterMethodName" : "setValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "<p>The new value of the variable.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Value" : {
+          "c2jName" : "value",
+          "c2jShape" : "VariableValue",
+          "deprecated" : false,
+          "documentation" : "<p>The new value of the variable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withValue",
+          "getterDocumentation" : "/**<p>The new value of the variable.</p>\n@return The new value of the variable.*/",
+          "getterMethodName" : "getValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "value",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "value",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Value",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.*/",
+          "setterMethodName" : "setValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "<p>The new value of the variable.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "VariableName" : {
+          "c2jName" : "variableName",
+          "c2jShape" : "VariableName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the variable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param variableName The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withVariableName",
+          "getterDocumentation" : "/**<p>The name of the variable.</p>\n@return The name of the variable.*/",
+          "getterMethodName" : "getVariableName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "variableName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "variableName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "VariableName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the variable.</p>\n@param variableName The name of the variable.*/",
+          "setterMethodName" : "setVariableName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "variableName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param variableName The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "variableName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the variable.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "variableName", "value" ],
+      "shapeName" : "SetVariableAction",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "SetVariableAction",
+        "variableName" : "setVariableAction",
+        "variableType" : "SetVariableAction",
+        "documentation" : null,
+        "simpleType" : "SetVariableAction",
+        "variableSetterType" : "SetVariableAction"
+      },
+      "wrapper" : false
+    },
+    "State" : {
+      "c2jName" : "State",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information that defines a state of a detector.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "stateName",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the state.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStateName",
+        "getterDocumentation" : "/**<p>The name of the state.</p>\n@return The name of the state.*/",
+        "getterMethodName" : "getStateName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "stateName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "stateName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StateName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.*/",
+        "setterMethodName" : "setStateName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the state.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "onInput",
+        "c2jShape" : "OnInputLifecycle",
+        "deprecated" : false,
+        "documentation" : "<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@param onInput When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withOnInput",
+        "getterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@return When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.*/",
+        "getterMethodName" : "getOnInput",
+        "getterModel" : {
+          "returnType" : "OnInputLifecycle",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "onInput",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "onInput",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "OnInput",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@param onInput When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.*/",
+        "setterMethodName" : "setOnInput",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "OnInputLifecycle",
+          "variableName" : "onInput",
+          "variableType" : "OnInputLifecycle",
+          "documentation" : "",
+          "simpleType" : "OnInputLifecycle",
+          "variableSetterType" : "OnInputLifecycle"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@param onInput When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "OnInputLifecycle",
+          "variableName" : "onInput",
+          "variableType" : "OnInputLifecycle",
+          "documentation" : "<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>",
+          "simpleType" : "OnInputLifecycle",
+          "variableSetterType" : "OnInputLifecycle"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "onEnter",
+        "c2jShape" : "OnEnterLifecycle",
+        "deprecated" : false,
+        "documentation" : "<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@param onEnter When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withOnEnter",
+        "getterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@return When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.*/",
+        "getterMethodName" : "getOnEnter",
+        "getterModel" : {
+          "returnType" : "OnEnterLifecycle",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "onEnter",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "onEnter",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "OnEnter",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@param onEnter When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.*/",
+        "setterMethodName" : "setOnEnter",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "OnEnterLifecycle",
+          "variableName" : "onEnter",
+          "variableType" : "OnEnterLifecycle",
+          "documentation" : "",
+          "simpleType" : "OnEnterLifecycle",
+          "variableSetterType" : "OnEnterLifecycle"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@param onEnter When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "OnEnterLifecycle",
+          "variableName" : "onEnter",
+          "variableType" : "OnEnterLifecycle",
+          "documentation" : "<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>",
+          "simpleType" : "OnEnterLifecycle",
+          "variableSetterType" : "OnEnterLifecycle"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "onExit",
+        "c2jShape" : "OnExitLifecycle",
+        "deprecated" : false,
+        "documentation" : "<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@param onExit When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withOnExit",
+        "getterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@return When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.*/",
+        "getterMethodName" : "getOnExit",
+        "getterModel" : {
+          "returnType" : "OnExitLifecycle",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "onExit",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "onExit",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "OnExit",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@param onExit When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.*/",
+        "setterMethodName" : "setOnExit",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "OnExitLifecycle",
+          "variableName" : "onExit",
+          "variableType" : "OnExitLifecycle",
+          "documentation" : "",
+          "simpleType" : "OnExitLifecycle",
+          "variableSetterType" : "OnExitLifecycle"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@param onExit When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "OnExitLifecycle",
+          "variableName" : "onExit",
+          "variableType" : "OnExitLifecycle",
+          "documentation" : "<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>",
+          "simpleType" : "OnExitLifecycle",
+          "variableSetterType" : "OnExitLifecycle"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "OnEnter" : {
+          "c2jName" : "onEnter",
+          "c2jShape" : "OnEnterLifecycle",
+          "deprecated" : false,
+          "documentation" : "<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@param onEnter When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withOnEnter",
+          "getterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@return When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.*/",
+          "getterMethodName" : "getOnEnter",
+          "getterModel" : {
+            "returnType" : "OnEnterLifecycle",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "onEnter",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "onEnter",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "OnEnter",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@param onEnter When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.*/",
+          "setterMethodName" : "setOnEnter",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "OnEnterLifecycle",
+            "variableName" : "onEnter",
+            "variableType" : "OnEnterLifecycle",
+            "documentation" : "",
+            "simpleType" : "OnEnterLifecycle",
+            "variableSetterType" : "OnEnterLifecycle"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>\n@param onEnter When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "OnEnterLifecycle",
+            "variableName" : "onEnter",
+            "variableType" : "OnEnterLifecycle",
+            "documentation" : "<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>",
+            "simpleType" : "OnEnterLifecycle",
+            "variableSetterType" : "OnEnterLifecycle"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "OnExit" : {
+          "c2jName" : "onExit",
+          "c2jShape" : "OnExitLifecycle",
+          "deprecated" : false,
+          "documentation" : "<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@param onExit When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withOnExit",
+          "getterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@return When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.*/",
+          "getterMethodName" : "getOnExit",
+          "getterModel" : {
+            "returnType" : "OnExitLifecycle",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "onExit",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "onExit",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "OnExit",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@param onExit When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.*/",
+          "setterMethodName" : "setOnExit",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "OnExitLifecycle",
+            "variableName" : "onExit",
+            "variableType" : "OnExitLifecycle",
+            "documentation" : "",
+            "simpleType" : "OnExitLifecycle",
+            "variableSetterType" : "OnExitLifecycle"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>\n@param onExit When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "OnExitLifecycle",
+            "variableName" : "onExit",
+            "variableType" : "OnExitLifecycle",
+            "documentation" : "<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>",
+            "simpleType" : "OnExitLifecycle",
+            "variableSetterType" : "OnExitLifecycle"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "OnInput" : {
+          "c2jName" : "onInput",
+          "c2jShape" : "OnInputLifecycle",
+          "deprecated" : false,
+          "documentation" : "<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@param onInput When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withOnInput",
+          "getterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@return When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.*/",
+          "getterMethodName" : "getOnInput",
+          "getterModel" : {
+            "returnType" : "OnInputLifecycle",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "onInput",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "onInput",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "OnInput",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@param onInput When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.*/",
+          "setterMethodName" : "setOnInput",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "OnInputLifecycle",
+            "variableName" : "onInput",
+            "variableType" : "OnInputLifecycle",
+            "documentation" : "",
+            "simpleType" : "OnInputLifecycle",
+            "variableSetterType" : "OnInputLifecycle"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>\n@param onInput When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "OnInputLifecycle",
+            "variableName" : "onInput",
+            "variableType" : "OnInputLifecycle",
+            "documentation" : "<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>",
+            "simpleType" : "OnInputLifecycle",
+            "variableSetterType" : "OnInputLifecycle"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "StateName" : {
+          "c2jName" : "stateName",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the state.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStateName",
+          "getterDocumentation" : "/**<p>The name of the state.</p>\n@return The name of the state.*/",
+          "getterMethodName" : "getStateName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "stateName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "stateName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "StateName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.*/",
+          "setterMethodName" : "setStateName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the state.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "stateName" ],
+      "shapeName" : "State",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "State",
+        "variableName" : "state",
+        "variableType" : "State",
+        "documentation" : null,
+        "simpleType" : "State",
+        "variableSetterType" : "State"
+      },
+      "wrapper" : false
+    },
+    "Tag" : {
+      "c2jName" : "Tag",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Metadata which can be used to manage the resource.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "key",
+        "c2jShape" : "TagKey",
+        "deprecated" : false,
+        "documentation" : "<p>The tag's key.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The tag's key.</p>\n@param key The tag's key.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKey",
+        "getterDocumentation" : "/**<p>The tag's key.</p>\n@return The tag's key.*/",
+        "getterMethodName" : "getKey",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "key",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "key",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Key",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The tag's key.</p>\n@param key The tag's key.*/",
+        "setterMethodName" : "setKey",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "key",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The tag's key.</p>\n@param key The tag's key.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "key",
+          "variableType" : "String",
+          "documentation" : "<p>The tag's key.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "value",
+        "c2jShape" : "TagValue",
+        "deprecated" : false,
+        "documentation" : "<p>The tag's value.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The tag's value.</p>\n@param value The tag's value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withValue",
+        "getterDocumentation" : "/**<p>The tag's value.</p>\n@return The tag's value.*/",
+        "getterMethodName" : "getValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "value",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "value",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Value",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The tag's value.</p>\n@param value The tag's value.*/",
+        "setterMethodName" : "setValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The tag's value.</p>\n@param value The tag's value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "<p>The tag's value.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Key" : {
+          "c2jName" : "key",
+          "c2jShape" : "TagKey",
+          "deprecated" : false,
+          "documentation" : "<p>The tag's key.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The tag's key.</p>\n@param key The tag's key.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKey",
+          "getterDocumentation" : "/**<p>The tag's key.</p>\n@return The tag's key.*/",
+          "getterMethodName" : "getKey",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "key",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "key",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Key",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The tag's key.</p>\n@param key The tag's key.*/",
+          "setterMethodName" : "setKey",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "key",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The tag's key.</p>\n@param key The tag's key.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "key",
+            "variableType" : "String",
+            "documentation" : "<p>The tag's key.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Value" : {
+          "c2jName" : "value",
+          "c2jShape" : "TagValue",
+          "deprecated" : false,
+          "documentation" : "<p>The tag's value.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The tag's value.</p>\n@param value The tag's value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withValue",
+          "getterDocumentation" : "/**<p>The tag's value.</p>\n@return The tag's value.*/",
+          "getterMethodName" : "getValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "value",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "value",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Value",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The tag's value.</p>\n@param value The tag's value.*/",
+          "setterMethodName" : "setValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The tag's value.</p>\n@param value The tag's value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "<p>The tag's value.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "key", "value" ],
+      "shapeName" : "Tag",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Tag",
+        "variableName" : "tag",
+        "variableType" : "Tag",
+        "documentation" : null,
+        "simpleType" : "Tag",
+        "variableSetterType" : "Tag"
+      },
+      "wrapper" : false
+    },
+    "TagResourceRequest" : {
+      "c2jName" : "TagResourceRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "TagResource",
+        "locationName" : null,
+        "requestUri" : "/tags",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tags",
+        "c2jShape" : "Tags",
+        "deprecated" : false,
+        "documentation" : "<p>The new or modified tags for the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n@param tags The new or modified tags for the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n@return The new or modified tags for the resource.*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.List<Tag>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Tag",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Tag",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Tag",
+              "variableName" : "member",
+              "variableType" : "Tag",
+              "documentation" : "",
+              "simpleType" : "Tag",
+              "variableSetterType" : "Tag"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Tag",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Tag",
+          "templateImplType" : "java.util.ArrayList<Tag>",
+          "templateType" : "java.util.List<Tag>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n@param tags The new or modified tags for the resource.*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags The new or modified tags for the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Tag>",
+          "variableName" : "tags",
+          "variableType" : "java.util.List<Tag>",
+          "documentation" : "<p>The new or modified tags for the resource.</p>",
+          "simpleType" : "List<Tag>",
+          "variableSetterType" : "java.util.Collection<Tag>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the resource.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "tags",
+          "c2jShape" : "Tags",
+          "deprecated" : false,
+          "documentation" : "<p>The new or modified tags for the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n@param tags The new or modified tags for the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n@return The new or modified tags for the resource.*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.List<Tag>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Tag",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Tag",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Tag",
+                "variableName" : "member",
+                "variableType" : "Tag",
+                "documentation" : "",
+                "simpleType" : "Tag",
+                "variableSetterType" : "Tag"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Tag",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Tag",
+            "templateImplType" : "java.util.ArrayList<Tag>",
+            "templateType" : "java.util.List<Tag>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n@param tags The new or modified tags for the resource.*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new or modified tags for the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTags(java.util.Collection)} or {@link #withTags(java.util.Collection)} if you want to override the existing values.</p>\n@param tags The new or modified tags for the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Tag>",
+            "variableName" : "tags",
+            "variableType" : "java.util.List<Tag>",
+            "documentation" : "<p>The new or modified tags for the resource.</p>",
+            "simpleType" : "List<Tag>",
+            "variableSetterType" : "java.util.Collection<Tag>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "tags" ],
+      "shapeName" : "TagResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceRequest",
+        "variableName" : "tagResourceRequest",
+        "variableType" : "TagResourceRequest",
+        "documentation" : null,
+        "simpleType" : "TagResourceRequest",
+        "variableSetterType" : "TagResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "TagResourceResult" : {
+      "c2jName" : "TagResourceResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TagResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceResult",
+        "variableName" : "tagResourceResult",
+        "variableType" : "TagResourceResult",
+        "documentation" : null,
+        "simpleType" : "TagResourceResult",
+        "variableSetterType" : "TagResourceResult"
+      },
+      "wrapper" : false
+    },
+    "ThrottlingException" : {
+      "c2jName" : "ThrottlingException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request could not be completed due to throttling.</p>",
+      "enums" : null,
+      "errorCode" : "ThrottlingException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ThrottlingException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ThrottlingException",
+        "variableName" : "throttlingException",
+        "variableType" : "ThrottlingException",
+        "documentation" : null,
+        "simpleType" : "ThrottlingException",
+        "variableSetterType" : "ThrottlingException"
+      },
+      "wrapper" : false
+    },
+    "TransitionEvent" : {
+      "c2jName" : "TransitionEvent",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "eventName",
+        "c2jShape" : "EventName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the transition event.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the transition event.</p>\n@param eventName The name of the transition event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEventName",
+        "getterDocumentation" : "/**<p>The name of the transition event.</p>\n@return The name of the transition event.*/",
+        "getterMethodName" : "getEventName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "eventName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "eventName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "EventName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the transition event.</p>\n@param eventName The name of the transition event.*/",
+        "setterMethodName" : "setEventName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "eventName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the transition event.</p>\n@param eventName The name of the transition event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "eventName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the transition event.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "condition",
+        "c2jShape" : "Condition",
+        "deprecated" : false,
+        "documentation" : "<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@param condition [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCondition",
+        "getterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@return [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.*/",
+        "getterMethodName" : "getCondition",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "condition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "condition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Condition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@param condition [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.*/",
+        "setterMethodName" : "setCondition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "condition",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@param condition [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "condition",
+          "variableType" : "String",
+          "documentation" : "<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "actions",
+        "c2jShape" : "Actions",
+        "deprecated" : false,
+        "documentation" : "<p>The actions to be performed.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withActions",
+        "getterDocumentation" : "/**<p>The actions to be performed.</p>\n@return The actions to be performed.*/",
+        "getterMethodName" : "getActions",
+        "getterModel" : {
+          "returnType" : "java.util.List<Action>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "actions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "actions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Action",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Action",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Action",
+              "variableName" : "member",
+              "variableType" : "Action",
+              "documentation" : "",
+              "simpleType" : "Action",
+              "variableSetterType" : "Action"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Action",
+              "variableName" : "member",
+              "variableType" : "Action",
+              "documentation" : "",
+              "simpleType" : "Action",
+              "variableSetterType" : "Action"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Action",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Action",
+          "templateImplType" : "java.util.ArrayList<Action>",
+          "templateType" : "java.util.List<Action>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Actions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.*/",
+        "setterMethodName" : "setActions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Action>",
+          "variableName" : "actions",
+          "variableType" : "java.util.List<Action>",
+          "documentation" : "",
+          "simpleType" : "List<Action>",
+          "variableSetterType" : "java.util.Collection<Action>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The actions to be performed.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setActions(java.util.Collection)} or {@link #withActions(java.util.Collection)} if you want to override the existing values.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Action>",
+          "variableName" : "actions",
+          "variableType" : "java.util.List<Action>",
+          "documentation" : "<p>The actions to be performed.</p>",
+          "simpleType" : "List<Action>",
+          "variableSetterType" : "java.util.Collection<Action>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextState",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>The next state to enter.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The next state to enter.</p>\n@param nextState The next state to enter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextState",
+        "getterDocumentation" : "/**<p>The next state to enter.</p>\n@return The next state to enter.*/",
+        "getterMethodName" : "getNextState",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextState",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextState",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextState",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The next state to enter.</p>\n@param nextState The next state to enter.*/",
+        "setterMethodName" : "setNextState",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextState",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The next state to enter.</p>\n@param nextState The next state to enter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextState",
+          "variableType" : "String",
+          "documentation" : "<p>The next state to enter.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Actions" : {
+          "c2jName" : "actions",
+          "c2jShape" : "Actions",
+          "deprecated" : false,
+          "documentation" : "<p>The actions to be performed.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withActions",
+          "getterDocumentation" : "/**<p>The actions to be performed.</p>\n@return The actions to be performed.*/",
+          "getterMethodName" : "getActions",
+          "getterModel" : {
+            "returnType" : "java.util.List<Action>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "actions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "actions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Action",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Action",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Action",
+                "variableName" : "member",
+                "variableType" : "Action",
+                "documentation" : "",
+                "simpleType" : "Action",
+                "variableSetterType" : "Action"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Action",
+                "variableName" : "member",
+                "variableType" : "Action",
+                "documentation" : "",
+                "simpleType" : "Action",
+                "variableSetterType" : "Action"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Action",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Action",
+            "templateImplType" : "java.util.ArrayList<Action>",
+            "templateType" : "java.util.List<Action>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Actions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The actions to be performed.</p>\n@param actions The actions to be performed.*/",
+          "setterMethodName" : "setActions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Action>",
+            "variableName" : "actions",
+            "variableType" : "java.util.List<Action>",
+            "documentation" : "",
+            "simpleType" : "List<Action>",
+            "variableSetterType" : "java.util.Collection<Action>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The actions to be performed.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setActions(java.util.Collection)} or {@link #withActions(java.util.Collection)} if you want to override the existing values.</p>\n@param actions The actions to be performed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Action>",
+            "variableName" : "actions",
+            "variableType" : "java.util.List<Action>",
+            "documentation" : "<p>The actions to be performed.</p>",
+            "simpleType" : "List<Action>",
+            "variableSetterType" : "java.util.Collection<Action>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Condition" : {
+          "c2jName" : "condition",
+          "c2jShape" : "Condition",
+          "deprecated" : false,
+          "documentation" : "<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@param condition [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCondition",
+          "getterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@return [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.*/",
+          "getterMethodName" : "getCondition",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "condition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "condition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Condition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@param condition [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.*/",
+          "setterMethodName" : "setCondition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "condition",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>\n@param condition [Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "condition",
+            "variableType" : "String",
+            "documentation" : "<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "EventName" : {
+          "c2jName" : "eventName",
+          "c2jShape" : "EventName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the transition event.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the transition event.</p>\n@param eventName The name of the transition event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEventName",
+          "getterDocumentation" : "/**<p>The name of the transition event.</p>\n@return The name of the transition event.*/",
+          "getterMethodName" : "getEventName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "eventName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "eventName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "EventName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the transition event.</p>\n@param eventName The name of the transition event.*/",
+          "setterMethodName" : "setEventName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "eventName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the transition event.</p>\n@param eventName The name of the transition event.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "eventName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the transition event.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextState" : {
+          "c2jName" : "nextState",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>The next state to enter.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The next state to enter.</p>\n@param nextState The next state to enter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextState",
+          "getterDocumentation" : "/**<p>The next state to enter.</p>\n@return The next state to enter.*/",
+          "getterMethodName" : "getNextState",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextState",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextState",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextState",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The next state to enter.</p>\n@param nextState The next state to enter.*/",
+          "setterMethodName" : "setNextState",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextState",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The next state to enter.</p>\n@param nextState The next state to enter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextState",
+            "variableType" : "String",
+            "documentation" : "<p>The next state to enter.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "eventName", "condition", "nextState" ],
+      "shapeName" : "TransitionEvent",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TransitionEvent",
+        "variableName" : "transitionEvent",
+        "variableType" : "TransitionEvent",
+        "documentation" : null,
+        "simpleType" : "TransitionEvent",
+        "variableSetterType" : "TransitionEvent"
+      },
+      "wrapper" : false
+    },
+    "UnsupportedOperationException" : {
+      "c2jName" : "UnsupportedOperationException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The requested operation is not supported.</p>",
+      "enums" : null,
+      "errorCode" : "UnsupportedOperationException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "UnsupportedOperationException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UnsupportedOperationException",
+        "variableName" : "unsupportedOperationException",
+        "variableType" : "UnsupportedOperationException",
+        "documentation" : null,
+        "simpleType" : "UnsupportedOperationException",
+        "variableSetterType" : "UnsupportedOperationException"
+      },
+      "wrapper" : false
+    },
+    "UntagResourceRequest" : {
+      "c2jName" : "UntagResourceRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "UntagResource",
+        "locationName" : null,
+        "requestUri" : "/tags",
+        "target" : null,
+        "verb" : "DELETE",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tagKeys",
+        "c2jShape" : "TagKeys",
+        "deprecated" : false,
+        "documentation" : "<p>A list of the keys of the tags to be removed from the resource.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n@param tagKeys A list of the keys of the tags to be removed from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTagKeys",
+        "getterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n@return A list of the keys of the tags to be removed from the resource.*/",
+        "getterMethodName" : "getTagKeys",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "tagKeys",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tagKeys",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "TagKey",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "TagKeys",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n@param tagKeys A list of the keys of the tags to be removed from the resource.*/",
+        "setterMethodName" : "setTagKeys",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "tagKeys",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys A list of the keys of the tags to be removed from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "tagKeys",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "<p>A list of the keys of the tags to be removed from the resource.</p>",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The ARN of the resource.</p>\n@return The ARN of the resource.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the resource.</p>\n@param resourceArn The ARN of the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the resource.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TagKeys" : {
+          "c2jName" : "tagKeys",
+          "c2jShape" : "TagKeys",
+          "deprecated" : false,
+          "documentation" : "<p>A list of the keys of the tags to be removed from the resource.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n@param tagKeys A list of the keys of the tags to be removed from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTagKeys",
+          "getterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n@return A list of the keys of the tags to be removed from the resource.*/",
+          "getterMethodName" : "getTagKeys",
+          "getterModel" : {
+            "returnType" : "java.util.List<String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "tagKeys",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tagKeys",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "TagKey",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "TagKeys",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n@param tagKeys A list of the keys of the tags to be removed from the resource.*/",
+          "setterMethodName" : "setTagKeys",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "tagKeys",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A list of the keys of the tags to be removed from the resource.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys A list of the keys of the tags to be removed from the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "tagKeys",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "<p>A list of the keys of the tags to be removed from the resource.</p>",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "tagKeys" ],
+      "shapeName" : "UntagResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceRequest",
+        "variableName" : "untagResourceRequest",
+        "variableType" : "UntagResourceRequest",
+        "documentation" : null,
+        "simpleType" : "UntagResourceRequest",
+        "variableSetterType" : "UntagResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "UntagResourceResult" : {
+      "c2jName" : "UntagResourceResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "UntagResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceResult",
+        "variableName" : "untagResourceResult",
+        "variableType" : "UntagResourceResult",
+        "documentation" : null,
+        "simpleType" : "UntagResourceResult",
+        "variableSetterType" : "UntagResourceResult"
+      },
+      "wrapper" : false
+    },
+    "UpdateDetectorModelRequest" : {
+      "c2jName" : "UpdateDetectorModelRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "UpdateDetectorModel",
+        "locationName" : null,
+        "requestUri" : "/detector-models/{detectorModelName}",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model to be updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@param detectorModelName The name of the detector model to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@return The name of the detector model to be updated.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@param detectorModelName The name of the detector model to be updated.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@param detectorModelName The name of the detector model to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model to be updated.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelDefinition",
+        "c2jShape" : "DetectorModelDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>Information that defines how a detector operates.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDefinition",
+        "getterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@return Information that defines how a detector operates.*/",
+        "getterMethodName" : "getDetectorModelDefinition",
+        "getterModel" : {
+          "returnType" : "DetectorModelDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDefinition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDefinition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModelDefinition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.*/",
+        "setterMethodName" : "setDetectorModelDefinition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelDefinition",
+          "variableName" : "detectorModelDefinition",
+          "variableType" : "DetectorModelDefinition",
+          "documentation" : "",
+          "simpleType" : "DetectorModelDefinition",
+          "variableSetterType" : "DetectorModelDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelDefinition",
+          "variableName" : "detectorModelDefinition",
+          "variableType" : "DetectorModelDefinition",
+          "documentation" : "<p>Information that defines how a detector operates.</p>",
+          "simpleType" : "DetectorModelDefinition",
+          "variableSetterType" : "DetectorModelDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelDescription",
+        "c2jShape" : "DetectorModelDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the detector model.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelDescription",
+        "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+        "getterMethodName" : "getDetectorModelDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+        "setterMethodName" : "setDetectorModelDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "roleArn",
+        "c2jShape" : "AmazonResourceName",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRoleArn",
+        "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+        "getterMethodName" : "getRoleArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "roleArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "roleArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "RoleArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+        "setterMethodName" : "setRoleArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "roleArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelDefinition" : {
+          "c2jName" : "detectorModelDefinition",
+          "c2jShape" : "DetectorModelDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>Information that defines how a detector operates.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDefinition",
+          "getterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@return Information that defines how a detector operates.*/",
+          "getterMethodName" : "getDetectorModelDefinition",
+          "getterModel" : {
+            "returnType" : "DetectorModelDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDefinition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDefinition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModelDefinition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.*/",
+          "setterMethodName" : "setDetectorModelDefinition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelDefinition",
+            "variableName" : "detectorModelDefinition",
+            "variableType" : "DetectorModelDefinition",
+            "documentation" : "",
+            "simpleType" : "DetectorModelDefinition",
+            "variableSetterType" : "DetectorModelDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information that defines how a detector operates.</p>\n@param detectorModelDefinition Information that defines how a detector operates.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelDefinition",
+            "variableName" : "detectorModelDefinition",
+            "variableType" : "DetectorModelDefinition",
+            "documentation" : "<p>Information that defines how a detector operates.</p>",
+            "simpleType" : "DetectorModelDefinition",
+            "variableSetterType" : "DetectorModelDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelDescription" : {
+          "c2jName" : "detectorModelDescription",
+          "c2jShape" : "DetectorModelDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the detector model.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelDescription",
+          "getterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@return A brief description of the detector model.*/",
+          "getterMethodName" : "getDetectorModelDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.*/",
+          "setterMethodName" : "setDetectorModelDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the detector model.</p>\n@param detectorModelDescription A brief description of the detector model.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the detector model.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model to be updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@param detectorModelName The name of the detector model to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@return The name of the detector model to be updated.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@param detectorModelName The name of the detector model to be updated.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model to be updated.</p>\n@param detectorModelName The name of the detector model to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model to be updated.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "RoleArn" : {
+          "c2jName" : "roleArn",
+          "c2jShape" : "AmazonResourceName",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRoleArn",
+          "getterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@return The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+          "getterMethodName" : "getRoleArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "roleArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "roleArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "RoleArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.*/",
+          "setterMethodName" : "setRoleArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>\n@param roleArn The ARN of the role that grants permission to AWS IoT Events to perform its operations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "roleArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName", "detectorModelDefinition", "roleArn" ],
+      "shapeName" : "UpdateDetectorModelRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateDetectorModelRequest",
+        "variableName" : "updateDetectorModelRequest",
+        "variableType" : "UpdateDetectorModelRequest",
+        "documentation" : null,
+        "simpleType" : "UpdateDetectorModelRequest",
+        "variableSetterType" : "UpdateDetectorModelRequest"
+      },
+      "wrapper" : false
+    },
+    "UpdateDetectorModelResult" : {
+      "c2jName" : "UpdateDetectorModelResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelConfiguration",
+        "c2jShape" : "DetectorModelConfiguration",
+        "deprecated" : false,
+        "documentation" : "<p>Information about how the detector model is configured.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelConfiguration",
+        "getterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@return Information about how the detector model is configured.*/",
+        "getterMethodName" : "getDetectorModelConfiguration",
+        "getterModel" : {
+          "returnType" : "DetectorModelConfiguration",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelConfiguration",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelConfiguration",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "DetectorModelConfiguration",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.*/",
+        "setterMethodName" : "setDetectorModelConfiguration",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelConfiguration",
+          "variableName" : "detectorModelConfiguration",
+          "variableType" : "DetectorModelConfiguration",
+          "documentation" : "",
+          "simpleType" : "DetectorModelConfiguration",
+          "variableSetterType" : "DetectorModelConfiguration"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorModelConfiguration",
+          "variableName" : "detectorModelConfiguration",
+          "variableType" : "DetectorModelConfiguration",
+          "documentation" : "<p>Information about how the detector model is configured.</p>",
+          "simpleType" : "DetectorModelConfiguration",
+          "variableSetterType" : "DetectorModelConfiguration"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelConfiguration" : {
+          "c2jName" : "detectorModelConfiguration",
+          "c2jShape" : "DetectorModelConfiguration",
+          "deprecated" : false,
+          "documentation" : "<p>Information about how the detector model is configured.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelConfiguration",
+          "getterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@return Information about how the detector model is configured.*/",
+          "getterMethodName" : "getDetectorModelConfiguration",
+          "getterModel" : {
+            "returnType" : "DetectorModelConfiguration",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelConfiguration",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelConfiguration",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "DetectorModelConfiguration",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.*/",
+          "setterMethodName" : "setDetectorModelConfiguration",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelConfiguration",
+            "variableName" : "detectorModelConfiguration",
+            "variableType" : "DetectorModelConfiguration",
+            "documentation" : "",
+            "simpleType" : "DetectorModelConfiguration",
+            "variableSetterType" : "DetectorModelConfiguration"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about how the detector model is configured.</p>\n@param detectorModelConfiguration Information about how the detector model is configured.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorModelConfiguration",
+            "variableName" : "detectorModelConfiguration",
+            "variableType" : "DetectorModelConfiguration",
+            "documentation" : "<p>Information about how the detector model is configured.</p>",
+            "simpleType" : "DetectorModelConfiguration",
+            "variableSetterType" : "DetectorModelConfiguration"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "UpdateDetectorModelResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateDetectorModelResult",
+        "variableName" : "updateDetectorModelResult",
+        "variableType" : "UpdateDetectorModelResult",
+        "documentation" : null,
+        "simpleType" : "UpdateDetectorModelResult",
+        "variableSetterType" : "UpdateDetectorModelResult"
+      },
+      "wrapper" : false
+    },
+    "UpdateInputRequest" : {
+      "c2jName" : "UpdateInputRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "UpdateInput",
+        "locationName" : null,
+        "requestUri" : "/inputs/{inputName}",
+        "target" : null,
+        "verb" : "PUT",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the input you want to update.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@param inputName The name of the input you want to update.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@return The name of the input you want to update.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@param inputName The name of the input you want to update.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@param inputName The name of the input you want to update.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the input you want to update.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDescription",
+        "c2jShape" : "InputDescription",
+        "deprecated" : false,
+        "documentation" : "<p>A brief description of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDescription",
+        "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+        "getterMethodName" : "getInputDescription",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDescription",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDescription",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputDescription",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+        "setterMethodName" : "setInputDescription",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputDescription",
+          "variableType" : "String",
+          "documentation" : "<p>A brief description of the input.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputDefinition",
+        "c2jShape" : "InputDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>The definition of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputDefinition",
+        "getterDocumentation" : "/**<p>The definition of the input.</p>\n@return The definition of the input.*/",
+        "getterMethodName" : "getInputDefinition",
+        "getterModel" : {
+          "returnType" : "InputDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputDefinition",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputDefinition",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "InputDefinition",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.*/",
+        "setterMethodName" : "setInputDefinition",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputDefinition",
+          "variableName" : "inputDefinition",
+          "variableType" : "InputDefinition",
+          "documentation" : "",
+          "simpleType" : "InputDefinition",
+          "variableSetterType" : "InputDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputDefinition",
+          "variableName" : "inputDefinition",
+          "variableType" : "InputDefinition",
+          "documentation" : "<p>The definition of the input.</p>",
+          "simpleType" : "InputDefinition",
+          "variableSetterType" : "InputDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputDefinition" : {
+          "c2jName" : "inputDefinition",
+          "c2jShape" : "InputDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>The definition of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDefinition",
+          "getterDocumentation" : "/**<p>The definition of the input.</p>\n@return The definition of the input.*/",
+          "getterMethodName" : "getInputDefinition",
+          "getterModel" : {
+            "returnType" : "InputDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDefinition",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDefinition",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "InputDefinition",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.*/",
+          "setterMethodName" : "setInputDefinition",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputDefinition",
+            "variableName" : "inputDefinition",
+            "variableType" : "InputDefinition",
+            "documentation" : "",
+            "simpleType" : "InputDefinition",
+            "variableSetterType" : "InputDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The definition of the input.</p>\n@param inputDefinition The definition of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputDefinition",
+            "variableName" : "inputDefinition",
+            "variableType" : "InputDefinition",
+            "documentation" : "<p>The definition of the input.</p>",
+            "simpleType" : "InputDefinition",
+            "variableSetterType" : "InputDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputDescription" : {
+          "c2jName" : "inputDescription",
+          "c2jShape" : "InputDescription",
+          "deprecated" : false,
+          "documentation" : "<p>A brief description of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputDescription",
+          "getterDocumentation" : "/**<p>A brief description of the input.</p>\n@return A brief description of the input.*/",
+          "getterMethodName" : "getInputDescription",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputDescription",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputDescription",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputDescription",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.*/",
+          "setterMethodName" : "setInputDescription",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A brief description of the input.</p>\n@param inputDescription A brief description of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputDescription",
+            "variableType" : "String",
+            "documentation" : "<p>A brief description of the input.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the input you want to update.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@param inputName The name of the input you want to update.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@return The name of the input you want to update.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@param inputName The name of the input you want to update.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the input you want to update.</p>\n@param inputName The name of the input you want to update.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the input you want to update.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "inputName", "inputDefinition" ],
+      "shapeName" : "UpdateInputRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateInputRequest",
+        "variableName" : "updateInputRequest",
+        "variableType" : "UpdateInputRequest",
+        "documentation" : null,
+        "simpleType" : "UpdateInputRequest",
+        "variableSetterType" : "UpdateInputRequest"
+      },
+      "wrapper" : false
+    },
+    "UpdateInputResult" : {
+      "c2jName" : "UpdateInputResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "inputConfiguration",
+        "c2jShape" : "InputConfiguration",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the configuration of the input.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputConfiguration",
+        "getterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@return Information about the configuration of the input.*/",
+        "getterMethodName" : "getInputConfiguration",
+        "getterModel" : {
+          "returnType" : "InputConfiguration",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputConfiguration",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputConfiguration",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "InputConfiguration",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.*/",
+        "setterMethodName" : "setInputConfiguration",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputConfiguration",
+          "variableName" : "inputConfiguration",
+          "variableType" : "InputConfiguration",
+          "documentation" : "",
+          "simpleType" : "InputConfiguration",
+          "variableSetterType" : "InputConfiguration"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "InputConfiguration",
+          "variableName" : "inputConfiguration",
+          "variableType" : "InputConfiguration",
+          "documentation" : "<p>Information about the configuration of the input.</p>",
+          "simpleType" : "InputConfiguration",
+          "variableSetterType" : "InputConfiguration"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputConfiguration" : {
+          "c2jName" : "inputConfiguration",
+          "c2jShape" : "InputConfiguration",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the configuration of the input.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputConfiguration",
+          "getterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@return Information about the configuration of the input.*/",
+          "getterMethodName" : "getInputConfiguration",
+          "getterModel" : {
+            "returnType" : "InputConfiguration",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputConfiguration",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputConfiguration",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "InputConfiguration",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.*/",
+          "setterMethodName" : "setInputConfiguration",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputConfiguration",
+            "variableName" : "inputConfiguration",
+            "variableType" : "InputConfiguration",
+            "documentation" : "",
+            "simpleType" : "InputConfiguration",
+            "variableSetterType" : "InputConfiguration"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the configuration of the input.</p>\n@param inputConfiguration Information about the configuration of the input.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "InputConfiguration",
+            "variableName" : "inputConfiguration",
+            "variableType" : "InputConfiguration",
+            "documentation" : "<p>Information about the configuration of the input.</p>",
+            "simpleType" : "InputConfiguration",
+            "variableSetterType" : "InputConfiguration"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "UpdateInputResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateInputResult",
+        "variableName" : "updateInputResult",
+        "variableType" : "UpdateInputResult",
+        "documentation" : null,
+        "simpleType" : "UpdateInputResult",
+        "variableSetterType" : "UpdateInputResult"
+      },
+      "wrapper" : false
+    }
+  },
+  "clientConfigFactory" : "ClientConfigurationFactory",
+  "examples" : {
+    "examples" : { },
+    "version" : "1.0"
+  },
+  "exceptionUnmarshallerImpl" : null,
+  "fileHeader" : "/*\n * Copyright 2014-2019 Amazon.com, Inc. or its affiliates. All Rights\n * Reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\").\n * You may not use this file except in compliance with the License.\n * A copy of the License is located at\n *\n *  http://aws.amazon.com/apache2.0\n *\n * or in the \"license\" file accompanying this file. This file is distributed\n * on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n * express or implied. See the License for the specific language governing\n * permissions and limitations under the License.\n */",
+  "hasWaiters" : false,
+  "sdkBaseResponseFqcn" : "com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata>",
+  "sdkModeledExceptionBaseClassName" : "AWSIoTEventsException",
+  "sdkModeledExceptionBaseFqcn" : "com.amazonaws.services.iotevents.model.AWSIoTEventsException",
+  "serviceBaseExceptionFqcn" : "com.amazonaws.AmazonServiceException",
+  "transformPackage" : "com.amazonaws.services.iotevents.model.transform"
+}
\ No newline at end of file
diff --git a/aws-java-sdk-models/src/main/resources/models/iotevents-2018-07-27-model.json b/aws-java-sdk-models/src/main/resources/models/iotevents-2018-07-27-model.json
new file mode 100644
index 000000000000..84863305f267
--- /dev/null
+++ b/aws-java-sdk-models/src/main/resources/models/iotevents-2018-07-27-model.json
@@ -0,0 +1,1516 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-07-27",
+    "endpointPrefix":"iotevents",
+    "protocol":"rest-json",
+    "serviceFullName":"AWS IoT Events",
+    "serviceId":"IoT Events",
+    "signatureVersion":"v4",
+    "signingName":"iotevents",
+    "uid":"iotevents-2018-07-27"
+  },
+  "operations":{
+    "CreateDetectorModel":{
+      "name":"CreateDetectorModel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detector-models"
+      },
+      "input":{"shape":"CreateDetectorModelRequest"},
+      "output":{"shape":"CreateDetectorModelResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceAlreadyExistsException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Creates a detector model.</p>"
+    },
+    "CreateInput":{
+      "name":"CreateInput",
+      "http":{
+        "method":"POST",
+        "requestUri":"/inputs",
+        "responseCode":201
+      },
+      "input":{"shape":"CreateInputRequest"},
+      "output":{"shape":"CreateInputResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ResourceAlreadyExistsException"}
+      ],
+      "documentation":"<p>Creates an input.</p>"
+    },
+    "DeleteDetectorModel":{
+      "name":"DeleteDetectorModel",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/detector-models/{detectorModelName}",
+        "responseCode":204
+      },
+      "input":{"shape":"DeleteDetectorModelRequest"},
+      "output":{"shape":"DeleteDetectorModelResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Deletes a detector model. Any active instances of the detector model are also deleted.</p>"
+    },
+    "DeleteInput":{
+      "name":"DeleteInput",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/inputs/{inputName}"
+      },
+      "input":{"shape":"DeleteInputRequest"},
+      "output":{"shape":"DeleteInputResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p>Deletes an input.</p>"
+    },
+    "DescribeDetectorModel":{
+      "name":"DescribeDetectorModel",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detector-models/{detectorModelName}"
+      },
+      "input":{"shape":"DescribeDetectorModelRequest"},
+      "output":{"shape":"DescribeDetectorModelResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Describes a detector model. If the <code>version</code> parameter is not specified, information about the latest version is returned.</p>"
+    },
+    "DescribeInput":{
+      "name":"DescribeInput",
+      "http":{
+        "method":"GET",
+        "requestUri":"/inputs/{inputName}"
+      },
+      "input":{"shape":"DescribeInputRequest"},
+      "output":{"shape":"DescribeInputResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Describes an input.</p>"
+    },
+    "DescribeLoggingOptions":{
+      "name":"DescribeLoggingOptions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/logging"
+      },
+      "input":{"shape":"DescribeLoggingOptionsRequest"},
+      "output":{"shape":"DescribeLoggingOptionsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnsupportedOperationException"}
+      ],
+      "documentation":"<p>Retrieves the current settings of the AWS IoT Events logging options.</p>"
+    },
+    "ListDetectorModelVersions":{
+      "name":"ListDetectorModelVersions",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detector-models/{detectorModelName}/versions"
+      },
+      "input":{"shape":"ListDetectorModelVersionsRequest"},
+      "output":{"shape":"ListDetectorModelVersionsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Lists all the versions of a detector model. Only the metadata associated with each detector model version is returned.</p>"
+    },
+    "ListDetectorModels":{
+      "name":"ListDetectorModels",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detector-models"
+      },
+      "input":{"shape":"ListDetectorModelsRequest"},
+      "output":{"shape":"ListDetectorModelsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Lists the detector models you have created. Only the metadata associated with each detector model is returned.</p>"
+    },
+    "ListInputs":{
+      "name":"ListInputs",
+      "http":{
+        "method":"GET",
+        "requestUri":"/inputs"
+      },
+      "input":{"shape":"ListInputsRequest"},
+      "output":{"shape":"ListInputsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Lists the inputs you have created.</p>"
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"GET",
+        "requestUri":"/tags"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Lists the tags (metadata) you have assigned to the resource.</p>"
+    },
+    "PutLoggingOptions":{
+      "name":"PutLoggingOptions",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/logging"
+      },
+      "input":{"shape":"PutLoggingOptionsRequest"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"UnsupportedOperationException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p>Sets or updates the AWS IoT Events logging options.</p> <p>Note that if you update the value of any <code>loggingOptions</code> field, it takes up to one minute for the change to take effect. Also, if you change the policy attached to the role you specified in the roleArn field (for example, to correct an invalid policy) it takes up to five minutes for that change to take effect.</p>"
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/tags"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Add to or modifies the tags of the given resource. Tags are metadata which can be used to manage a resource.</p>"
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/tags"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"}
+      ],
+      "documentation":"<p>Removes the given tags (metadata) from the resource.</p>"
+    },
+    "UpdateDetectorModel":{
+      "name":"UpdateDetectorModel",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detector-models/{detectorModelName}"
+      },
+      "input":{"shape":"UpdateDetectorModelRequest"},
+      "output":{"shape":"UpdateDetectorModelResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceInUseException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Updates a detector model. Detectors (instances) spawned by the previous version will be deleted and re-created as new inputs arrive.</p>"
+    },
+    "UpdateInput":{
+      "name":"UpdateInput",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/inputs/{inputName}"
+      },
+      "input":{"shape":"UpdateInputRequest"},
+      "output":{"shape":"UpdateInputResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ResourceInUseException"}
+      ],
+      "documentation":"<p>Updates an input.</p>"
+    }
+  },
+  "shapes":{
+    "Action":{
+      "type":"structure",
+      "members":{
+        "setVariable":{
+          "shape":"SetVariableAction",
+          "documentation":"<p>Sets a variable to a specified value.</p>"
+        },
+        "sns":{
+          "shape":"SNSTopicPublishAction",
+          "documentation":"<p>Sends an Amazon SNS message.</p>"
+        },
+        "iotTopicPublish":{
+          "shape":"IotTopicPublishAction",
+          "documentation":"<p>Publishes an MQTT message with the given topic to the AWS IoT Message Broker.</p>"
+        },
+        "setTimer":{
+          "shape":"SetTimerAction",
+          "documentation":"<p>Information needed to set the timer.</p>"
+        },
+        "clearTimer":{
+          "shape":"ClearTimerAction",
+          "documentation":"<p>Information needed to clear the timer.</p>"
+        },
+        "resetTimer":{
+          "shape":"ResetTimerAction",
+          "documentation":"<p>Information needed to reset the timer.</p>"
+        }
+      },
+      "documentation":"<p>An action to be performed when the <code>condition</code> is TRUE.</p>"
+    },
+    "Actions":{
+      "type":"list",
+      "member":{"shape":"Action"}
+    },
+    "AmazonResourceName":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "Attribute":{
+      "type":"structure",
+      "required":["jsonPath"],
+      "members":{
+        "jsonPath":{
+          "shape":"AttributeJsonPath",
+          "documentation":"<p>An expression that specifies an attribute-value pair in a JSON structure. Use this to specify an attribute from the JSON payload that is made available by the input. Inputs are derived from messages sent to the AWS IoT Events system (<code>BatchPutMessage</code>). Each such message contains a JSON payload, and the attribute (and its paired value) specified here are available for use in the <code>condition</code> expressions used by detectors. </p> <p>Syntax: <code>&lt;field-name&gt;.&lt;field-name&gt;...</code> </p>"
+        }
+      },
+      "documentation":"<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here are available for use in the <code>condition</code> expressions used by detectors. </p>"
+    },
+    "AttributeJsonPath":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^((`[\\w\\- ]+`)|([\\w\\-]+))(\\.((`[\\w- ]+`)|([\\w\\-]+)))*$"
+    },
+    "Attributes":{
+      "type":"list",
+      "member":{"shape":"Attribute"},
+      "max":200,
+      "min":1
+    },
+    "ClearTimerAction":{
+      "type":"structure",
+      "required":["timerName"],
+      "members":{
+        "timerName":{
+          "shape":"TimerName",
+          "documentation":"<p>The name of the timer to clear.</p>"
+        }
+      },
+      "documentation":"<p>Information needed to clear the timer.</p>"
+    },
+    "Condition":{
+      "type":"string",
+      "max":512
+    },
+    "CreateDetectorModelRequest":{
+      "type":"structure",
+      "required":[
+        "detectorModelName",
+        "detectorModelDefinition",
+        "roleArn"
+      ],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model.</p>"
+        },
+        "detectorModelDefinition":{
+          "shape":"DetectorModelDefinition",
+          "documentation":"<p>Information that defines how the detectors operate.</p>"
+        },
+        "detectorModelDescription":{
+          "shape":"DetectorModelDescription",
+          "documentation":"<p>A brief description of the detector model.</p>"
+        },
+        "key":{
+          "shape":"AttributeJsonPath",
+          "documentation":"<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>"
+        },
+        "roleArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>Metadata which can be used to manage the detector model.</p>"
+        }
+      }
+    },
+    "CreateDetectorModelResponse":{
+      "type":"structure",
+      "members":{
+        "detectorModelConfiguration":{
+          "shape":"DetectorModelConfiguration",
+          "documentation":"<p>Information about how the detector model is configured.</p>"
+        }
+      }
+    },
+    "CreateInputRequest":{
+      "type":"structure",
+      "required":[
+        "inputName",
+        "inputDefinition"
+      ],
+      "members":{
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name you want to give to the input.</p>"
+        },
+        "inputDescription":{
+          "shape":"InputDescription",
+          "documentation":"<p>A brief description of the input.</p>"
+        },
+        "inputDefinition":{
+          "shape":"InputDefinition",
+          "documentation":"<p>The definition of the input.</p>"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>Metadata which can be used to manage the input.</p>"
+        }
+      }
+    },
+    "CreateInputResponse":{
+      "type":"structure",
+      "members":{
+        "inputConfiguration":{
+          "shape":"InputConfiguration",
+          "documentation":"<p>Information about the configuration of the input.</p>"
+        }
+      }
+    },
+    "DeleteDetectorModelRequest":{
+      "type":"structure",
+      "required":["detectorModelName"],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model to be deleted.</p>",
+          "location":"uri",
+          "locationName":"detectorModelName"
+        }
+      }
+    },
+    "DeleteDetectorModelResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteInputRequest":{
+      "type":"structure",
+      "required":["inputName"],
+      "members":{
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name of the input to be deleted.</p>",
+          "location":"uri",
+          "locationName":"inputName"
+        }
+      }
+    },
+    "DeleteInputResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeDetectorModelRequest":{
+      "type":"structure",
+      "required":["detectorModelName"],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model.</p>",
+          "location":"uri",
+          "locationName":"detectorModelName"
+        },
+        "detectorModelVersion":{
+          "shape":"DetectorModelVersion",
+          "documentation":"<p>The version of the detector model.</p>",
+          "location":"querystring",
+          "locationName":"version"
+        }
+      }
+    },
+    "DescribeDetectorModelResponse":{
+      "type":"structure",
+      "members":{
+        "detectorModel":{
+          "shape":"DetectorModel",
+          "documentation":"<p>Information about the detector model.</p>"
+        }
+      }
+    },
+    "DescribeInputRequest":{
+      "type":"structure",
+      "required":["inputName"],
+      "members":{
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name of the input.</p>",
+          "location":"uri",
+          "locationName":"inputName"
+        }
+      }
+    },
+    "DescribeInputResponse":{
+      "type":"structure",
+      "members":{
+        "input":{
+          "shape":"Input",
+          "documentation":"<p>Information about the input.</p>"
+        }
+      }
+    },
+    "DescribeLoggingOptionsRequest":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DescribeLoggingOptionsResponse":{
+      "type":"structure",
+      "members":{
+        "loggingOptions":{
+          "shape":"LoggingOptions",
+          "documentation":"<p>The current settings of the AWS IoT Events logging options.</p>"
+        }
+      }
+    },
+    "DetectorDebugOption":{
+      "type":"structure",
+      "required":["detectorModelName"],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model.</p>"
+        },
+        "keyValue":{
+          "shape":"KeyValue",
+          "documentation":"<p>The value of the input attribute key used to create the detector (the instance of the detector model).</p>"
+        }
+      },
+      "documentation":"<p>The detector model and the specific detectors (instances) for which the logging level is given.</p>"
+    },
+    "DetectorDebugOptions":{
+      "type":"list",
+      "member":{"shape":"DetectorDebugOption"},
+      "min":1
+    },
+    "DetectorModel":{
+      "type":"structure",
+      "members":{
+        "detectorModelDefinition":{
+          "shape":"DetectorModelDefinition",
+          "documentation":"<p>Information that defines how a detector operates.</p>"
+        },
+        "detectorModelConfiguration":{
+          "shape":"DetectorModelConfiguration",
+          "documentation":"<p>Information about how the detector is configured.</p>"
+        }
+      },
+      "documentation":"<p>Information about the detector model.</p>"
+    },
+    "DetectorModelArn":{"type":"string"},
+    "DetectorModelConfiguration":{
+      "type":"structure",
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model.</p>"
+        },
+        "detectorModelVersion":{
+          "shape":"DetectorModelVersion",
+          "documentation":"<p>The version of the detector model.</p>"
+        },
+        "detectorModelDescription":{
+          "shape":"DetectorModelDescription",
+          "documentation":"<p>A brief description of the detector model.</p>"
+        },
+        "detectorModelArn":{
+          "shape":"DetectorModelArn",
+          "documentation":"<p>The ARN of the detector model.</p>"
+        },
+        "roleArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector model was created.</p>"
+        },
+        "lastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector model was last updated.</p>"
+        },
+        "status":{
+          "shape":"DetectorModelVersionStatus",
+          "documentation":"<p>The status of the detector model.</p>"
+        },
+        "key":{
+          "shape":"AttributeJsonPath",
+          "documentation":"<p>The input attribute key used to identify a device or system in order to create a detector (an instance of the detector model) and then to route each input received to the appropriate detector (instance). This parameter uses a JSON-path expression to specify the attribute-value pair in the message payload of each input that is used to identify the device associated with the input.</p>"
+        }
+      },
+      "documentation":"<p>Information about how the detector model is configured.</p>"
+    },
+    "DetectorModelDefinition":{
+      "type":"structure",
+      "required":[
+        "states",
+        "initialStateName"
+      ],
+      "members":{
+        "states":{
+          "shape":"States",
+          "documentation":"<p>Information about the states of the detector.</p>"
+        },
+        "initialStateName":{
+          "shape":"StateName",
+          "documentation":"<p>The state that is entered at the creation of each detector (instance).</p>"
+        }
+      },
+      "documentation":"<p>Information that defines how a detector operates.</p>"
+    },
+    "DetectorModelDescription":{
+      "type":"string",
+      "max":128
+    },
+    "DetectorModelName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9_-]+$"
+    },
+    "DetectorModelSummaries":{
+      "type":"list",
+      "member":{"shape":"DetectorModelSummary"}
+    },
+    "DetectorModelSummary":{
+      "type":"structure",
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model.</p>"
+        },
+        "detectorModelDescription":{
+          "shape":"DetectorModelDescription",
+          "documentation":"<p>A brief description of the detector model.</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector model was created.</p>"
+        }
+      },
+      "documentation":"<p>Information about the detector model.</p>"
+    },
+    "DetectorModelVersion":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "DetectorModelVersionStatus":{
+      "type":"string",
+      "enum":[
+        "ACTIVE",
+        "ACTIVATING",
+        "INACTIVE",
+        "DEPRECATED",
+        "DRAFT",
+        "PAUSED",
+        "FAILED"
+      ]
+    },
+    "DetectorModelVersionSummaries":{
+      "type":"list",
+      "member":{"shape":"DetectorModelVersionSummary"}
+    },
+    "DetectorModelVersionSummary":{
+      "type":"structure",
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model.</p>"
+        },
+        "detectorModelVersion":{
+          "shape":"DetectorModelVersion",
+          "documentation":"<p>The ID of the detector model version.</p>"
+        },
+        "detectorModelArn":{
+          "shape":"DetectorModelArn",
+          "documentation":"<p>The ARN of the detector model version.</p>"
+        },
+        "roleArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the role that grants the detector model permission to perform its tasks.</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector model version was created.</p>"
+        },
+        "lastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time the detector model version was updated.</p>"
+        },
+        "status":{
+          "shape":"DetectorModelVersionStatus",
+          "documentation":"<p>The status of the detector model version.</p>"
+        }
+      },
+      "documentation":"<p>Information about the detector model version.</p>"
+    },
+    "Event":{
+      "type":"structure",
+      "required":["eventName"],
+      "members":{
+        "eventName":{
+          "shape":"EventName",
+          "documentation":"<p>The name of the event.</p>"
+        },
+        "condition":{
+          "shape":"Condition",
+          "documentation":"<p>[Optional] The Boolean expression that when TRUE causes the <code>actions</code> to be performed. If not present, the actions are performed (=TRUE); if the expression result is not a Boolean value the actions are NOT performed (=FALSE).</p>"
+        },
+        "actions":{
+          "shape":"Actions",
+          "documentation":"<p>The actions to be performed.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the <code>actions</code> to be performed when the <code>condition</code> evaluates to TRUE.</p>"
+    },
+    "EventName":{
+      "type":"string",
+      "max":128
+    },
+    "Events":{
+      "type":"list",
+      "member":{"shape":"Event"}
+    },
+    "Input":{
+      "type":"structure",
+      "members":{
+        "inputConfiguration":{
+          "shape":"InputConfiguration",
+          "documentation":"<p>Information about the configuration of an input.</p>"
+        },
+        "inputDefinition":{
+          "shape":"InputDefinition",
+          "documentation":"<p>The definition of the input.</p>"
+        }
+      },
+      "documentation":"<p>Information about the input.</p>"
+    },
+    "InputArn":{"type":"string"},
+    "InputConfiguration":{
+      "type":"structure",
+      "required":[
+        "inputName",
+        "inputArn",
+        "creationTime",
+        "lastUpdateTime",
+        "status"
+      ],
+      "members":{
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name of the input.</p>"
+        },
+        "inputDescription":{
+          "shape":"InputDescription",
+          "documentation":"<p>A brief description of the input.</p>"
+        },
+        "inputArn":{
+          "shape":"InputArn",
+          "documentation":"<p>The ARN of the input.</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the input was created.</p>"
+        },
+        "lastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time the input was updated.</p>"
+        },
+        "status":{
+          "shape":"InputStatus",
+          "documentation":"<p>The status of the input.</p>"
+        }
+      },
+      "documentation":"<p>Information about the configuration of an input.</p>"
+    },
+    "InputDefinition":{
+      "type":"structure",
+      "required":["attributes"],
+      "members":{
+        "attributes":{
+          "shape":"Attributes",
+          "documentation":"<p>The attributes from the JSON payload that are made available by the input. Inputs are derived from messages sent to the AWS IoT Events system using <code>BatchPutMessage</code>. Each such message contains a JSON payload, and those attributes (and their paired values) specified here is available for use in the <code>condition</code> expressions used by detectors that monitor this input. </p>"
+        }
+      },
+      "documentation":"<p>The definition of the input.</p>"
+    },
+    "InputDescription":{
+      "type":"string",
+      "max":128
+    },
+    "InputName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "InputStatus":{
+      "type":"string",
+      "enum":[
+        "CREATING",
+        "UPDATING",
+        "ACTIVE",
+        "DELETING"
+      ]
+    },
+    "InputSummaries":{
+      "type":"list",
+      "member":{"shape":"InputSummary"}
+    },
+    "InputSummary":{
+      "type":"structure",
+      "members":{
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name of the input.</p>"
+        },
+        "inputDescription":{
+          "shape":"InputDescription",
+          "documentation":"<p>A brief description of the input.</p>"
+        },
+        "inputArn":{
+          "shape":"InputArn",
+          "documentation":"<p>The ARN of the input.</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the input was created.</p>"
+        },
+        "lastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The last time the input was updated.</p>"
+        },
+        "status":{
+          "shape":"InputStatus",
+          "documentation":"<p>The status of the input.</p>"
+        }
+      },
+      "documentation":"<p>Information about the input.</p>"
+    },
+    "InternalFailureException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>An internal failure occurred.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "InvalidRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The request was invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "IotTopicPublishAction":{
+      "type":"structure",
+      "required":["mqttTopic"],
+      "members":{
+        "mqttTopic":{
+          "shape":"MQTTTopic",
+          "documentation":"<p>The MQTT topic of the message.</p>"
+        }
+      },
+      "documentation":"<p>Information required to publish the MQTT message via the AWS IoT Message Broker.</p>"
+    },
+    "KeyValue":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9\\-_]+$"
+    },
+    "LimitExceededException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>A limit was exceeded.</p>",
+      "error":{"httpStatusCode":410},
+      "exception":true
+    },
+    "ListDetectorModelVersionsRequest":{
+      "type":"structure",
+      "required":["detectorModelName"],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model whose versions are returned.</p>",
+          "location":"uri",
+          "locationName":"detectorModelName"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListDetectorModelVersionsResponse":{
+      "type":"structure",
+      "members":{
+        "detectorModelVersionSummaries":{
+          "shape":"DetectorModelVersionSummaries",
+          "documentation":"<p>Summary information about the detector model versions.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>"
+        }
+      }
+    },
+    "ListDetectorModelsRequest":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListDetectorModelsResponse":{
+      "type":"structure",
+      "members":{
+        "detectorModelSummaries":{
+          "shape":"DetectorModelSummaries",
+          "documentation":"<p>Summary information about the detector models.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>"
+        }
+      }
+    },
+    "ListInputsRequest":{
+      "type":"structure",
+      "members":{
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListInputsResponse":{
+      "type":"structure",
+      "members":{
+        "inputSummaries":{
+          "shape":"InputSummaries",
+          "documentation":"<p>Summary information about the inputs.</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>"
+        }
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["resourceArn"],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the resource.</p>",
+          "location":"querystring",
+          "locationName":"resourceArn"
+        }
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The list of tags assigned to the resource.</p>"
+        }
+      }
+    },
+    "LoggingEnabled":{"type":"boolean"},
+    "LoggingLevel":{
+      "type":"string",
+      "enum":[
+        "ERROR",
+        "INFO",
+        "DEBUG"
+      ]
+    },
+    "LoggingOptions":{
+      "type":"structure",
+      "required":[
+        "roleArn",
+        "level",
+        "enabled"
+      ],
+      "members":{
+        "roleArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the role that grants permission to AWS IoT Events to perform logging.</p>"
+        },
+        "level":{
+          "shape":"LoggingLevel",
+          "documentation":"<p>The logging level. Currently, only \"ERROR\" is supported.</p>"
+        },
+        "enabled":{
+          "shape":"LoggingEnabled",
+          "documentation":"<p>If TRUE, logging is enabled for AWS IoT Events.</p>"
+        },
+        "detectorDebugOptions":{
+          "shape":"DetectorDebugOptions",
+          "documentation":"<p>Information that identifies those detector models and their detectors (instances) for which the logging level is given.</p>"
+        }
+      },
+      "documentation":"<p>The values of the AWS IoT Events logging options.</p>"
+    },
+    "MQTTTopic":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":250,
+      "min":1
+    },
+    "NextToken":{"type":"string"},
+    "OnEnterLifecycle":{
+      "type":"structure",
+      "members":{
+        "events":{
+          "shape":"Events",
+          "documentation":"<p>Specifies the actions that are performed when the state is entered and the <code>condition</code> is TRUE.</p>"
+        }
+      },
+      "documentation":"<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>"
+    },
+    "OnExitLifecycle":{
+      "type":"structure",
+      "members":{
+        "events":{
+          "shape":"Events",
+          "documentation":"<p>Specifies the actions that are performed when the state is exited and the <code>condition</code> is TRUE.</p>"
+        }
+      },
+      "documentation":"<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>"
+    },
+    "OnInputLifecycle":{
+      "type":"structure",
+      "members":{
+        "events":{
+          "shape":"Events",
+          "documentation":"<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>"
+        },
+        "transitionEvents":{
+          "shape":"TransitionEvents",
+          "documentation":"<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the actions performed when the <code>condition</code> evaluates to TRUE.</p>"
+    },
+    "PutLoggingOptionsRequest":{
+      "type":"structure",
+      "required":["loggingOptions"],
+      "members":{
+        "loggingOptions":{
+          "shape":"LoggingOptions",
+          "documentation":"<p>The new values of the AWS IoT Events logging options.</p>"
+        }
+      }
+    },
+    "ResetTimerAction":{
+      "type":"structure",
+      "required":["timerName"],
+      "members":{
+        "timerName":{
+          "shape":"TimerName",
+          "documentation":"<p>The name of the timer to reset.</p>"
+        }
+      },
+      "documentation":"<p>Information needed to reset the timer.</p>"
+    },
+    "ResourceAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        },
+        "resourceId":{
+          "shape":"resourceId",
+          "documentation":"<p>The ID of the resource.</p>"
+        },
+        "resourceArn":{
+          "shape":"resourceArn",
+          "documentation":"<p>The ARN of the resource.</p>"
+        }
+      },
+      "documentation":"<p>The resource already exists.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "ResourceInUseException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The resource is in use.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The resource was not found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "SNSTopicPublishAction":{
+      "type":"structure",
+      "required":["targetArn"],
+      "members":{
+        "targetArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the Amazon SNS target to which the message is sent.</p>"
+        }
+      },
+      "documentation":"<p>Information required to publish the Amazon SNS message.</p>"
+    },
+    "Seconds":{"type":"integer"},
+    "ServiceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The service is currently unavailable.</p>",
+      "error":{"httpStatusCode":503},
+      "exception":true,
+      "fault":true
+    },
+    "SetTimerAction":{
+      "type":"structure",
+      "required":[
+        "timerName",
+        "seconds"
+      ],
+      "members":{
+        "timerName":{
+          "shape":"TimerName",
+          "documentation":"<p>The name of the timer.</p>"
+        },
+        "seconds":{
+          "shape":"Seconds",
+          "documentation":"<p>The number of seconds until the timer expires. The minimum value is 60 seconds to ensure accuracy.</p>"
+        }
+      },
+      "documentation":"<p>Information needed to set the timer.</p>"
+    },
+    "SetVariableAction":{
+      "type":"structure",
+      "required":[
+        "variableName",
+        "value"
+      ],
+      "members":{
+        "variableName":{
+          "shape":"VariableName",
+          "documentation":"<p>The name of the variable.</p>"
+        },
+        "value":{
+          "shape":"VariableValue",
+          "documentation":"<p>The new value of the variable.</p>"
+        }
+      },
+      "documentation":"<p>Information about the variable and its new value.</p>"
+    },
+    "State":{
+      "type":"structure",
+      "required":["stateName"],
+      "members":{
+        "stateName":{
+          "shape":"StateName",
+          "documentation":"<p>The name of the state.</p>"
+        },
+        "onInput":{
+          "shape":"OnInputLifecycle",
+          "documentation":"<p>When an input is received and the <code>condition</code> is TRUE, perform the specified <code>actions</code>.</p>"
+        },
+        "onEnter":{
+          "shape":"OnEnterLifecycle",
+          "documentation":"<p>When entering this state, perform these <code>actions</code> if the <code>condition</code> is TRUE.</p>"
+        },
+        "onExit":{
+          "shape":"OnExitLifecycle",
+          "documentation":"<p>When exiting this state, perform these <code>actions</code> if the specified <code>condition</code> is TRUE.</p>"
+        }
+      },
+      "documentation":"<p>Information that defines a state of a detector.</p>"
+    },
+    "StateName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "States":{
+      "type":"list",
+      "member":{"shape":"State"},
+      "min":1
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "key",
+        "value"
+      ],
+      "members":{
+        "key":{
+          "shape":"TagKey",
+          "documentation":"<p>The tag's key.</p>"
+        },
+        "value":{
+          "shape":"TagValue",
+          "documentation":"<p>The tag's value.</p>"
+        }
+      },
+      "documentation":"<p>Metadata which can be used to manage the resource.</p>"
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "TagKeys":{
+      "type":"list",
+      "member":{"shape":"TagKey"}
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tags"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the resource.</p>",
+          "location":"querystring",
+          "locationName":"resourceArn"
+        },
+        "tags":{
+          "shape":"Tags",
+          "documentation":"<p>The new or modified tags for the resource.</p>"
+        }
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0
+    },
+    "Tags":{
+      "type":"list",
+      "member":{"shape":"Tag"}
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The request could not be completed due to throttling.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "TimerName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "Timestamp":{"type":"timestamp"},
+    "TransitionEvent":{
+      "type":"structure",
+      "required":[
+        "eventName",
+        "condition",
+        "nextState"
+      ],
+      "members":{
+        "eventName":{
+          "shape":"EventName",
+          "documentation":"<p>The name of the transition event.</p>"
+        },
+        "condition":{
+          "shape":"Condition",
+          "documentation":"<p>[Required] A Boolean expression that when TRUE causes the actions to be performed and the <code>nextState</code> to be entered.</p>"
+        },
+        "actions":{
+          "shape":"Actions",
+          "documentation":"<p>The actions to be performed.</p>"
+        },
+        "nextState":{
+          "shape":"StateName",
+          "documentation":"<p>The next state to enter.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the actions performed and the next state entered when a <code>condition</code> evaluates to TRUE.</p>"
+    },
+    "TransitionEvents":{
+      "type":"list",
+      "member":{"shape":"TransitionEvent"}
+    },
+    "UnsupportedOperationException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The requested operation is not supported.</p>",
+      "error":{"httpStatusCode":501},
+      "exception":true,
+      "fault":true
+    },
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "resourceArn",
+        "tagKeys"
+      ],
+      "members":{
+        "resourceArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the resource.</p>",
+          "location":"querystring",
+          "locationName":"resourceArn"
+        },
+        "tagKeys":{
+          "shape":"TagKeys",
+          "documentation":"<p>A list of the keys of the tags to be removed from the resource.</p>",
+          "location":"querystring",
+          "locationName":"tagKeys"
+        }
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "UpdateDetectorModelRequest":{
+      "type":"structure",
+      "required":[
+        "detectorModelName",
+        "detectorModelDefinition",
+        "roleArn"
+      ],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model to be updated.</p>",
+          "location":"uri",
+          "locationName":"detectorModelName"
+        },
+        "detectorModelDefinition":{
+          "shape":"DetectorModelDefinition",
+          "documentation":"<p>Information that defines how a detector operates.</p>"
+        },
+        "detectorModelDescription":{
+          "shape":"DetectorModelDescription",
+          "documentation":"<p>A brief description of the detector model.</p>"
+        },
+        "roleArn":{
+          "shape":"AmazonResourceName",
+          "documentation":"<p>The ARN of the role that grants permission to AWS IoT Events to perform its operations.</p>"
+        }
+      }
+    },
+    "UpdateDetectorModelResponse":{
+      "type":"structure",
+      "members":{
+        "detectorModelConfiguration":{
+          "shape":"DetectorModelConfiguration",
+          "documentation":"<p>Information about how the detector model is configured.</p>"
+        }
+      }
+    },
+    "UpdateInputRequest":{
+      "type":"structure",
+      "required":[
+        "inputName",
+        "inputDefinition"
+      ],
+      "members":{
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name of the input you want to update.</p>",
+          "location":"uri",
+          "locationName":"inputName"
+        },
+        "inputDescription":{
+          "shape":"InputDescription",
+          "documentation":"<p>A brief description of the input.</p>"
+        },
+        "inputDefinition":{
+          "shape":"InputDefinition",
+          "documentation":"<p>The definition of the input.</p>"
+        }
+      }
+    },
+    "UpdateInputResponse":{
+      "type":"structure",
+      "members":{
+        "inputConfiguration":{
+          "shape":"InputConfiguration",
+          "documentation":"<p>Information about the configuration of the input.</p>"
+        }
+      }
+    },
+    "VariableName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "VariableValue":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "errorMessage":{"type":"string"},
+    "resourceArn":{"type":"string"},
+    "resourceId":{"type":"string"}
+  },
+  "documentation":"<p>AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions when such events occur.</p>"
+}
diff --git a/aws-java-sdk-models/src/main/resources/models/iotevents-data-2018-10-23-intermediate.json b/aws-java-sdk-models/src/main/resources/models/iotevents-data-2018-10-23-intermediate.json
new file mode 100644
index 000000000000..dc5379bd60bc
--- /dev/null
+++ b/aws-java-sdk-models/src/main/resources/models/iotevents-data-2018-10-23-intermediate.json
@@ -0,0 +1,10078 @@
+{
+  "customizationConfig" : {
+    "additionalShapeConstructors" : null,
+    "authPolicyActions" : {
+      "actionPrefix" : null,
+      "additionalOperations" : null,
+      "fileNamePrefix" : null,
+      "skip" : true
+    },
+    "calculateCRC32FromCompressedData" : false,
+    "contentTypeOverride" : null,
+    "convenienceTypeOverloads" : [ ],
+    "customClientConfigFactory" : null,
+    "customCodeTemplates" : null,
+    "customErrorCodeFieldName" : null,
+    "customExceptionUnmarshallerImpl" : null,
+    "customFileHeader" : null,
+    "customResponseHandlerFqcn" : null,
+    "customResponseMetadataClassName" : null,
+    "customServiceMetadata" : null,
+    "customServiceNameForRequest" : null,
+    "customSignerProvider" : null,
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "emitLegacyEnumSetterFor" : null,
+    "operationModifiers" : null,
+    "operationsWithResponseStreamContentLengthValidation" : null,
+    "presignersFqcn" : null,
+    "renameShapes" : null,
+    "requestMetrics" : null,
+    "requiredParamValidationEnabled" : false,
+    "sdkModeledExceptionBaseClassName" : null,
+    "sendEmptyAutoConstructedListAsEmptyList" : null,
+    "sendExplicitlyEmptyListsForQuery" : false,
+    "serviceClientHoldInputStream" : false,
+    "shapeModifiers" : null,
+    "shapeSubstitutions" : null,
+    "simpleMethods" : null,
+    "skipClientMethodForOperations" : [ ],
+    "skipInterfaceAdditions" : false,
+    "skipSmokeTests" : true,
+    "transformDirectory" : "transform",
+    "useAutoConstructList" : false,
+    "useAutoConstructMap" : false,
+    "useUidAsFilePrefix" : true
+  },
+  "metadata" : {
+    "apiVersion" : "2018-10-23",
+    "asyncClient" : "AWSIoTEventsDataAsyncClient",
+    "asyncClientBuilderClassName" : "AWSIoTEventsDataAsyncClientBuilder",
+    "asyncInterface" : "AWSIoTEventsDataAsync",
+    "cborProtocol" : false,
+    "checksumFormat" : null,
+    "contentType" : "",
+    "cucumberModuleInjectorClassName" : "AWSIoTEventsDataModuleInjector",
+    "defaultEndpoint" : "data.iotevents.us-east-1.amazonaws.com",
+    "defaultEndpointWithoutHttpProtocol" : "data.iotevents.us-east-1.amazonaws.com",
+    "defaultRegion" : null,
+    "documentation" : "<p>AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions when such events occur.</p>",
+    "endpointPrefix" : "data.iotevents",
+    "hasApiWithStreamInput" : false,
+    "ionProtocol" : false,
+    "jsonProtocol" : true,
+    "jsonVersion" : "1.1",
+    "packageName" : "com.amazonaws.services.ioteventsdata",
+    "packagePath" : "com/amazonaws/services/ioteventsdata",
+    "protocol" : "rest-json",
+    "protocolDefaultExceptionUmarshallerImpl" : null,
+    "protocolFactory" : "com.amazonaws.protocol.json.SdkJsonProtocolFactory",
+    "requestBaseFqcn" : "com.amazonaws.AmazonWebServiceRequest",
+    "requiresApiKey" : false,
+    "requiresIamSigners" : false,
+    "serviceAbbreviation" : null,
+    "serviceFullName" : "AWS IoT Events Data",
+    "serviceId" : "IoT Events Data",
+    "serviceName" : "AWS IoT Events Data",
+    "signingName" : "ioteventsdata",
+    "smokeTestsPackageName" : "com.amazonaws.services.ioteventsdata.smoketests",
+    "syncClient" : "AWSIoTEventsDataClient",
+    "syncClientBuilderClassName" : "AWSIoTEventsDataClientBuilder",
+    "syncInterface" : "AWSIoTEventsData",
+    "uid" : "iotevents-data-2018-10-23",
+    "unmarshallerClassSuffix" : "JsonUnmarshaller",
+    "unmarshallerContextClassName" : "JsonUnmarshallerContext",
+    "xmlProtocol" : false
+  },
+  "operations" : {
+    "BatchPutMessage" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<BatchPutMessageResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<BatchPutMessageResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<BatchPutMessageRequest, BatchPutMessageResult>",
+      "asyncReturnType" : "BatchPutMessageResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Sends a set of messages to the AWS IoT Events system. Each message payload will be transformed into the input you specify (<code>inputName</code>) and ingested into any detectors that monitor that input. If multiple messages are sent, the order in which the messages are processed is not guaranteed--you must send messages one at a time and wait for a successful response to guarantee ordering. </p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occured.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchPutMessageRequest",
+        "variableName" : "batchPutMessageRequest",
+        "variableType" : "BatchPutMessageRequest",
+        "documentation" : "",
+        "simpleType" : "BatchPutMessageRequest",
+        "variableSetterType" : "BatchPutMessageRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "batchPutMessage",
+      "operationName" : "BatchPutMessage",
+      "returnType" : {
+        "returnType" : "BatchPutMessageResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "BatchPutMessageResult"
+    },
+    "BatchUpdateDetector" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<BatchUpdateDetectorResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<BatchUpdateDetectorResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<BatchUpdateDetectorRequest, BatchUpdateDetectorResult>",
+      "asyncReturnType" : "BatchUpdateDetectorResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Updates the state, variable values, and timer settings of one or more detectors (instances) of a specified detector model.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occured.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchUpdateDetectorRequest",
+        "variableName" : "batchUpdateDetectorRequest",
+        "variableType" : "BatchUpdateDetectorRequest",
+        "documentation" : "",
+        "simpleType" : "BatchUpdateDetectorRequest",
+        "variableSetterType" : "BatchUpdateDetectorRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "batchUpdateDetector",
+      "operationName" : "BatchUpdateDetector",
+      "returnType" : {
+        "returnType" : "BatchUpdateDetectorResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "BatchUpdateDetectorResult"
+    },
+    "DescribeDetector" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DescribeDetectorResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DescribeDetectorResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DescribeDetectorRequest, DescribeDetectorResult>",
+      "asyncReturnType" : "DescribeDetectorResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Returns information about the specified detector (instance).</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occured.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeDetectorRequest",
+        "variableName" : "describeDetectorRequest",
+        "variableType" : "DescribeDetectorRequest",
+        "documentation" : "",
+        "simpleType" : "DescribeDetectorRequest",
+        "variableSetterType" : "DescribeDetectorRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "describeDetector",
+      "operationName" : "DescribeDetector",
+      "returnType" : {
+        "returnType" : "DescribeDetectorResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "DescribeDetectorResult"
+    },
+    "ListDetectors" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListDetectorsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListDetectorsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListDetectorsRequest, ListDetectorsResult>",
+      "asyncReturnType" : "ListDetectorsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Lists detectors (the instances of a detector model).</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidRequestException",
+        "documentation" : "<p>The request was invalid.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The resource was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ThrottlingException",
+        "documentation" : "<p>The request could not be completed due to throttling.</p>",
+        "httpStatusCode" : 429
+      }, {
+        "exceptionName" : "InternalFailureException",
+        "documentation" : "<p>An internal failure occured.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "<p>The service is currently unavailable.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorsRequest",
+        "variableName" : "listDetectorsRequest",
+        "variableType" : "ListDetectorsRequest",
+        "documentation" : "",
+        "simpleType" : "ListDetectorsRequest",
+        "variableSetterType" : "ListDetectorsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listDetectors",
+      "operationName" : "ListDetectors",
+      "returnType" : {
+        "returnType" : "ListDetectorsResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListDetectorsResult"
+    }
+  },
+  "shapes" : {
+    "BatchPutMessageErrorEntry" : {
+      "c2jName" : "BatchPutMessageErrorEntry",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Contains informations about the errors encountered.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "messageId",
+        "c2jShape" : "MessageId",
+        "deprecated" : false,
+        "documentation" : "<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@param messageId The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMessageId",
+        "getterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@return The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)*/",
+        "getterMethodName" : "getMessageId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "messageId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "messageId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "MessageId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@param messageId The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)*/",
+        "setterMethodName" : "setMessageId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@param messageId The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "errorCode",
+        "c2jShape" : "ErrorCode",
+        "deprecated" : false,
+        "documentation" : "<p>The code associated with the error.</p>",
+        "enumType" : "ErrorCode",
+        "fluentSetterDocumentation" : "/**<p>The code associated with the error.</p>\n@param errorCode The code associated with the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+        "fluentSetterMethodName" : "withErrorCode",
+        "getterDocumentation" : "/**<p>The code associated with the error.</p>\n@return The code associated with the error.\n@see ErrorCode*/",
+        "getterMethodName" : "getErrorCode",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "errorCode",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "errorCode",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ErrorCode",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The code associated with the error.</p>\n@param errorCode The code associated with the error.\n@see ErrorCode*/",
+        "setterMethodName" : "setErrorCode",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorCode",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The code associated with the error.</p>\n@param errorCode The code associated with the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorCode",
+          "variableType" : "String",
+          "documentation" : "<p>The code associated with the error.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "errorMessage",
+        "c2jShape" : "ErrorMessage",
+        "deprecated" : false,
+        "documentation" : "<p>More information about the error.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>More information about the error.</p>\n@param errorMessage More information about the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withErrorMessage",
+        "getterDocumentation" : "/**<p>More information about the error.</p>\n@return More information about the error.*/",
+        "getterMethodName" : "getErrorMessage",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "errorMessage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "errorMessage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ErrorMessage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>More information about the error.</p>\n@param errorMessage More information about the error.*/",
+        "setterMethodName" : "setErrorMessage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorMessage",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>More information about the error.</p>\n@param errorMessage More information about the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorMessage",
+          "variableType" : "String",
+          "documentation" : "<p>More information about the error.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ErrorCode" : {
+          "c2jName" : "errorCode",
+          "c2jShape" : "ErrorCode",
+          "deprecated" : false,
+          "documentation" : "<p>The code associated with the error.</p>",
+          "enumType" : "ErrorCode",
+          "fluentSetterDocumentation" : "/**<p>The code associated with the error.</p>\n@param errorCode The code associated with the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+          "fluentSetterMethodName" : "withErrorCode",
+          "getterDocumentation" : "/**<p>The code associated with the error.</p>\n@return The code associated with the error.\n@see ErrorCode*/",
+          "getterMethodName" : "getErrorCode",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "errorCode",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "errorCode",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ErrorCode",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The code associated with the error.</p>\n@param errorCode The code associated with the error.\n@see ErrorCode*/",
+          "setterMethodName" : "setErrorCode",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorCode",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The code associated with the error.</p>\n@param errorCode The code associated with the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorCode",
+            "variableType" : "String",
+            "documentation" : "<p>The code associated with the error.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ErrorMessage" : {
+          "c2jName" : "errorMessage",
+          "c2jShape" : "ErrorMessage",
+          "deprecated" : false,
+          "documentation" : "<p>More information about the error.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>More information about the error.</p>\n@param errorMessage More information about the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withErrorMessage",
+          "getterDocumentation" : "/**<p>More information about the error.</p>\n@return More information about the error.*/",
+          "getterMethodName" : "getErrorMessage",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "errorMessage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "errorMessage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ErrorMessage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>More information about the error.</p>\n@param errorMessage More information about the error.*/",
+          "setterMethodName" : "setErrorMessage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorMessage",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>More information about the error.</p>\n@param errorMessage More information about the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorMessage",
+            "variableType" : "String",
+            "documentation" : "<p>More information about the error.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MessageId" : {
+          "c2jName" : "messageId",
+          "c2jShape" : "MessageId",
+          "deprecated" : false,
+          "documentation" : "<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@param messageId The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMessageId",
+          "getterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@return The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)*/",
+          "getterMethodName" : "getMessageId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "messageId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "messageId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "MessageId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@param messageId The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)*/",
+          "setterMethodName" : "setMessageId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>\n@param messageId The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BatchPutMessageErrorEntry",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchPutMessageErrorEntry",
+        "variableName" : "batchPutMessageErrorEntry",
+        "variableType" : "BatchPutMessageErrorEntry",
+        "documentation" : null,
+        "simpleType" : "BatchPutMessageErrorEntry",
+        "variableSetterType" : "BatchPutMessageErrorEntry"
+      },
+      "wrapper" : false
+    },
+    "BatchPutMessageRequest" : {
+      "c2jName" : "BatchPutMessageRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "BatchPutMessage",
+        "locationName" : null,
+        "requestUri" : "/inputs/messages",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "messages",
+        "c2jShape" : "Messages",
+        "deprecated" : false,
+        "documentation" : "<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n@param messages The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMessages",
+        "getterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n@return The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.*/",
+        "getterMethodName" : "getMessages",
+        "getterModel" : {
+          "returnType" : "java.util.List<Message>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "messages",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "messages",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Message",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Message",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Message",
+              "variableName" : "member",
+              "variableType" : "Message",
+              "documentation" : "",
+              "simpleType" : "Message",
+              "variableSetterType" : "Message"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Message",
+              "variableName" : "member",
+              "variableType" : "Message",
+              "documentation" : "",
+              "simpleType" : "Message",
+              "variableSetterType" : "Message"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Message",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Message",
+          "templateImplType" : "java.util.ArrayList<Message>",
+          "templateType" : "java.util.List<Message>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Messages",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n@param messages The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.*/",
+        "setterMethodName" : "setMessages",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Message>",
+          "variableName" : "messages",
+          "variableType" : "java.util.List<Message>",
+          "documentation" : "",
+          "simpleType" : "List<Message>",
+          "variableSetterType" : "java.util.Collection<Message>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setMessages(java.util.Collection)} or {@link #withMessages(java.util.Collection)} if you want to override the existing values.</p>\n@param messages The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Message>",
+          "variableName" : "messages",
+          "variableType" : "java.util.List<Message>",
+          "documentation" : "<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>",
+          "simpleType" : "List<Message>",
+          "variableSetterType" : "java.util.Collection<Message>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Messages" : {
+          "c2jName" : "messages",
+          "c2jShape" : "Messages",
+          "deprecated" : false,
+          "documentation" : "<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n@param messages The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMessages",
+          "getterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n@return The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.*/",
+          "getterMethodName" : "getMessages",
+          "getterModel" : {
+            "returnType" : "java.util.List<Message>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "messages",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "messages",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Message",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Message",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Message",
+                "variableName" : "member",
+                "variableType" : "Message",
+                "documentation" : "",
+                "simpleType" : "Message",
+                "variableSetterType" : "Message"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Message",
+                "variableName" : "member",
+                "variableType" : "Message",
+                "documentation" : "",
+                "simpleType" : "Message",
+                "variableSetterType" : "Message"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Message",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Message",
+            "templateImplType" : "java.util.ArrayList<Message>",
+            "templateType" : "java.util.List<Message>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Messages",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n@param messages The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.*/",
+          "setterMethodName" : "setMessages",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Message>",
+            "variableName" : "messages",
+            "variableType" : "java.util.List<Message>",
+            "documentation" : "",
+            "simpleType" : "List<Message>",
+            "variableSetterType" : "java.util.Collection<Message>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setMessages(java.util.Collection)} or {@link #withMessages(java.util.Collection)} if you want to override the existing values.</p>\n@param messages The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Message>",
+            "variableName" : "messages",
+            "variableType" : "java.util.List<Message>",
+            "documentation" : "<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>",
+            "simpleType" : "List<Message>",
+            "variableSetterType" : "java.util.Collection<Message>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "messages" ],
+      "shapeName" : "BatchPutMessageRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchPutMessageRequest",
+        "variableName" : "batchPutMessageRequest",
+        "variableType" : "BatchPutMessageRequest",
+        "documentation" : null,
+        "simpleType" : "BatchPutMessageRequest",
+        "variableSetterType" : "BatchPutMessageRequest"
+      },
+      "wrapper" : false
+    },
+    "BatchPutMessageResult" : {
+      "c2jName" : "BatchPutMessageResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "BatchPutMessageErrorEntries",
+        "c2jShape" : "BatchPutMessageErrorEntries",
+        "deprecated" : false,
+        "documentation" : "<p>A list of any errors encountered when sending the messages.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n@param batchPutMessageErrorEntries A list of any errors encountered when sending the messages.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBatchPutMessageErrorEntries",
+        "getterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n@return A list of any errors encountered when sending the messages.*/",
+        "getterMethodName" : "getBatchPutMessageErrorEntries",
+        "getterModel" : {
+          "returnType" : "java.util.List<BatchPutMessageErrorEntry>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "BatchPutMessageErrorEntries",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "BatchPutMessageErrorEntries",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "BatchPutMessageErrorEntry",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "BatchPutMessageErrorEntry",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "BatchPutMessageErrorEntry",
+              "variableName" : "member",
+              "variableType" : "BatchPutMessageErrorEntry",
+              "documentation" : "",
+              "simpleType" : "BatchPutMessageErrorEntry",
+              "variableSetterType" : "BatchPutMessageErrorEntry"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "BatchPutMessageErrorEntry",
+              "variableName" : "member",
+              "variableType" : "BatchPutMessageErrorEntry",
+              "documentation" : "",
+              "simpleType" : "BatchPutMessageErrorEntry",
+              "variableSetterType" : "BatchPutMessageErrorEntry"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "BatchPutMessageErrorEntry",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "BatchPutMessageErrorEntry",
+          "templateImplType" : "java.util.ArrayList<BatchPutMessageErrorEntry>",
+          "templateType" : "java.util.List<BatchPutMessageErrorEntry>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "BatchPutMessageErrorEntries",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n@param batchPutMessageErrorEntries A list of any errors encountered when sending the messages.*/",
+        "setterMethodName" : "setBatchPutMessageErrorEntries",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<BatchPutMessageErrorEntry>",
+          "variableName" : "batchPutMessageErrorEntries",
+          "variableType" : "java.util.List<BatchPutMessageErrorEntry>",
+          "documentation" : "",
+          "simpleType" : "List<BatchPutMessageErrorEntry>",
+          "variableSetterType" : "java.util.Collection<BatchPutMessageErrorEntry>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setBatchPutMessageErrorEntries(java.util.Collection)} or {@link #withBatchPutMessageErrorEntries(java.util.Collection)} if you want to override the existing values.</p>\n@param batchPutMessageErrorEntries A list of any errors encountered when sending the messages.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<BatchPutMessageErrorEntry>",
+          "variableName" : "batchPutMessageErrorEntries",
+          "variableType" : "java.util.List<BatchPutMessageErrorEntry>",
+          "documentation" : "<p>A list of any errors encountered when sending the messages.</p>",
+          "simpleType" : "List<BatchPutMessageErrorEntry>",
+          "variableSetterType" : "java.util.Collection<BatchPutMessageErrorEntry>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "BatchPutMessageErrorEntries" : {
+          "c2jName" : "BatchPutMessageErrorEntries",
+          "c2jShape" : "BatchPutMessageErrorEntries",
+          "deprecated" : false,
+          "documentation" : "<p>A list of any errors encountered when sending the messages.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n@param batchPutMessageErrorEntries A list of any errors encountered when sending the messages.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBatchPutMessageErrorEntries",
+          "getterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n@return A list of any errors encountered when sending the messages.*/",
+          "getterMethodName" : "getBatchPutMessageErrorEntries",
+          "getterModel" : {
+            "returnType" : "java.util.List<BatchPutMessageErrorEntry>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "BatchPutMessageErrorEntries",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "BatchPutMessageErrorEntries",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "BatchPutMessageErrorEntry",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "BatchPutMessageErrorEntry",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "BatchPutMessageErrorEntry",
+                "variableName" : "member",
+                "variableType" : "BatchPutMessageErrorEntry",
+                "documentation" : "",
+                "simpleType" : "BatchPutMessageErrorEntry",
+                "variableSetterType" : "BatchPutMessageErrorEntry"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "BatchPutMessageErrorEntry",
+                "variableName" : "member",
+                "variableType" : "BatchPutMessageErrorEntry",
+                "documentation" : "",
+                "simpleType" : "BatchPutMessageErrorEntry",
+                "variableSetterType" : "BatchPutMessageErrorEntry"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "BatchPutMessageErrorEntry",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "BatchPutMessageErrorEntry",
+            "templateImplType" : "java.util.ArrayList<BatchPutMessageErrorEntry>",
+            "templateType" : "java.util.List<BatchPutMessageErrorEntry>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "BatchPutMessageErrorEntries",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n@param batchPutMessageErrorEntries A list of any errors encountered when sending the messages.*/",
+          "setterMethodName" : "setBatchPutMessageErrorEntries",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<BatchPutMessageErrorEntry>",
+            "variableName" : "batchPutMessageErrorEntries",
+            "variableType" : "java.util.List<BatchPutMessageErrorEntry>",
+            "documentation" : "",
+            "simpleType" : "List<BatchPutMessageErrorEntry>",
+            "variableSetterType" : "java.util.Collection<BatchPutMessageErrorEntry>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A list of any errors encountered when sending the messages.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setBatchPutMessageErrorEntries(java.util.Collection)} or {@link #withBatchPutMessageErrorEntries(java.util.Collection)} if you want to override the existing values.</p>\n@param batchPutMessageErrorEntries A list of any errors encountered when sending the messages.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<BatchPutMessageErrorEntry>",
+            "variableName" : "batchPutMessageErrorEntries",
+            "variableType" : "java.util.List<BatchPutMessageErrorEntry>",
+            "documentation" : "<p>A list of any errors encountered when sending the messages.</p>",
+            "simpleType" : "List<BatchPutMessageErrorEntry>",
+            "variableSetterType" : "java.util.Collection<BatchPutMessageErrorEntry>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BatchPutMessageResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchPutMessageResult",
+        "variableName" : "batchPutMessageResult",
+        "variableType" : "BatchPutMessageResult",
+        "documentation" : null,
+        "simpleType" : "BatchPutMessageResult",
+        "variableSetterType" : "BatchPutMessageResult"
+      },
+      "wrapper" : false
+    },
+    "BatchUpdateDetectorErrorEntry" : {
+      "c2jName" : "BatchUpdateDetectorErrorEntry",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the error which occured when attempting to update a detector.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "messageId",
+        "c2jShape" : "MessageId",
+        "deprecated" : false,
+        "documentation" : "<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@param messageId The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMessageId",
+        "getterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@return The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)*/",
+        "getterMethodName" : "getMessageId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "messageId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "messageId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "MessageId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@param messageId The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)*/",
+        "setterMethodName" : "setMessageId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@param messageId The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "errorCode",
+        "c2jShape" : "ErrorCode",
+        "deprecated" : false,
+        "documentation" : "<p>The code of the error.</p>",
+        "enumType" : "ErrorCode",
+        "fluentSetterDocumentation" : "/**<p>The code of the error.</p>\n@param errorCode The code of the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+        "fluentSetterMethodName" : "withErrorCode",
+        "getterDocumentation" : "/**<p>The code of the error.</p>\n@return The code of the error.\n@see ErrorCode*/",
+        "getterMethodName" : "getErrorCode",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "errorCode",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "errorCode",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ErrorCode",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The code of the error.</p>\n@param errorCode The code of the error.\n@see ErrorCode*/",
+        "setterMethodName" : "setErrorCode",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorCode",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The code of the error.</p>\n@param errorCode The code of the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorCode",
+          "variableType" : "String",
+          "documentation" : "<p>The code of the error.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "errorMessage",
+        "c2jShape" : "ErrorMessage",
+        "deprecated" : false,
+        "documentation" : "<p>A message describing the error.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A message describing the error.</p>\n@param errorMessage A message describing the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withErrorMessage",
+        "getterDocumentation" : "/**<p>A message describing the error.</p>\n@return A message describing the error.*/",
+        "getterMethodName" : "getErrorMessage",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "errorMessage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "errorMessage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ErrorMessage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A message describing the error.</p>\n@param errorMessage A message describing the error.*/",
+        "setterMethodName" : "setErrorMessage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorMessage",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A message describing the error.</p>\n@param errorMessage A message describing the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "errorMessage",
+          "variableType" : "String",
+          "documentation" : "<p>A message describing the error.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ErrorCode" : {
+          "c2jName" : "errorCode",
+          "c2jShape" : "ErrorCode",
+          "deprecated" : false,
+          "documentation" : "<p>The code of the error.</p>",
+          "enumType" : "ErrorCode",
+          "fluentSetterDocumentation" : "/**<p>The code of the error.</p>\n@param errorCode The code of the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+          "fluentSetterMethodName" : "withErrorCode",
+          "getterDocumentation" : "/**<p>The code of the error.</p>\n@return The code of the error.\n@see ErrorCode*/",
+          "getterMethodName" : "getErrorCode",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "errorCode",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "errorCode",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ErrorCode",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The code of the error.</p>\n@param errorCode The code of the error.\n@see ErrorCode*/",
+          "setterMethodName" : "setErrorCode",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorCode",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The code of the error.</p>\n@param errorCode The code of the error.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ErrorCode*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorCode",
+            "variableType" : "String",
+            "documentation" : "<p>The code of the error.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ErrorMessage" : {
+          "c2jName" : "errorMessage",
+          "c2jShape" : "ErrorMessage",
+          "deprecated" : false,
+          "documentation" : "<p>A message describing the error.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A message describing the error.</p>\n@param errorMessage A message describing the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withErrorMessage",
+          "getterDocumentation" : "/**<p>A message describing the error.</p>\n@return A message describing the error.*/",
+          "getterMethodName" : "getErrorMessage",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "errorMessage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "errorMessage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ErrorMessage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A message describing the error.</p>\n@param errorMessage A message describing the error.*/",
+          "setterMethodName" : "setErrorMessage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorMessage",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A message describing the error.</p>\n@param errorMessage A message describing the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "errorMessage",
+            "variableType" : "String",
+            "documentation" : "<p>A message describing the error.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MessageId" : {
+          "c2jName" : "messageId",
+          "c2jShape" : "MessageId",
+          "deprecated" : false,
+          "documentation" : "<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@param messageId The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMessageId",
+          "getterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@return The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)*/",
+          "getterMethodName" : "getMessageId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "messageId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "messageId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "MessageId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@param messageId The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)*/",
+          "setterMethodName" : "setMessageId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>\n@param messageId The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BatchUpdateDetectorErrorEntry",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchUpdateDetectorErrorEntry",
+        "variableName" : "batchUpdateDetectorErrorEntry",
+        "variableType" : "BatchUpdateDetectorErrorEntry",
+        "documentation" : null,
+        "simpleType" : "BatchUpdateDetectorErrorEntry",
+        "variableSetterType" : "BatchUpdateDetectorErrorEntry"
+      },
+      "wrapper" : false
+    },
+    "BatchUpdateDetectorRequest" : {
+      "c2jName" : "BatchUpdateDetectorRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "BatchUpdateDetector",
+        "locationName" : null,
+        "requestUri" : "/detectors",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectors",
+        "c2jShape" : "UpdateDetectorRequests",
+        "deprecated" : false,
+        "documentation" : "<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n@param detectors The list of detectors (instances) to be updated, along with the values to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectors",
+        "getterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n@return The list of detectors (instances) to be updated, along with the values to be updated.*/",
+        "getterMethodName" : "getDetectors",
+        "getterModel" : {
+          "returnType" : "java.util.List<UpdateDetectorRequest>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectors",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectors",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "UpdateDetectorRequest",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "UpdateDetectorRequest",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "UpdateDetectorRequest",
+              "variableName" : "member",
+              "variableType" : "UpdateDetectorRequest",
+              "documentation" : "",
+              "simpleType" : "UpdateDetectorRequest",
+              "variableSetterType" : "UpdateDetectorRequest"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "UpdateDetectorRequest",
+              "variableName" : "member",
+              "variableType" : "UpdateDetectorRequest",
+              "documentation" : "",
+              "simpleType" : "UpdateDetectorRequest",
+              "variableSetterType" : "UpdateDetectorRequest"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "UpdateDetectorRequest",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "UpdateDetectorRequest",
+          "templateImplType" : "java.util.ArrayList<UpdateDetectorRequest>",
+          "templateType" : "java.util.List<UpdateDetectorRequest>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Detectors",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n@param detectors The list of detectors (instances) to be updated, along with the values to be updated.*/",
+        "setterMethodName" : "setDetectors",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<UpdateDetectorRequest>",
+          "variableName" : "detectors",
+          "variableType" : "java.util.List<UpdateDetectorRequest>",
+          "documentation" : "",
+          "simpleType" : "List<UpdateDetectorRequest>",
+          "variableSetterType" : "java.util.Collection<UpdateDetectorRequest>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectors(java.util.Collection)} or {@link #withDetectors(java.util.Collection)} if you want to override the existing values.</p>\n@param detectors The list of detectors (instances) to be updated, along with the values to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<UpdateDetectorRequest>",
+          "variableName" : "detectors",
+          "variableType" : "java.util.List<UpdateDetectorRequest>",
+          "documentation" : "<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>",
+          "simpleType" : "List<UpdateDetectorRequest>",
+          "variableSetterType" : "java.util.Collection<UpdateDetectorRequest>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Detectors" : {
+          "c2jName" : "detectors",
+          "c2jShape" : "UpdateDetectorRequests",
+          "deprecated" : false,
+          "documentation" : "<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n@param detectors The list of detectors (instances) to be updated, along with the values to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectors",
+          "getterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n@return The list of detectors (instances) to be updated, along with the values to be updated.*/",
+          "getterMethodName" : "getDetectors",
+          "getterModel" : {
+            "returnType" : "java.util.List<UpdateDetectorRequest>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectors",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectors",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "UpdateDetectorRequest",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "UpdateDetectorRequest",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "UpdateDetectorRequest",
+                "variableName" : "member",
+                "variableType" : "UpdateDetectorRequest",
+                "documentation" : "",
+                "simpleType" : "UpdateDetectorRequest",
+                "variableSetterType" : "UpdateDetectorRequest"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "UpdateDetectorRequest",
+                "variableName" : "member",
+                "variableType" : "UpdateDetectorRequest",
+                "documentation" : "",
+                "simpleType" : "UpdateDetectorRequest",
+                "variableSetterType" : "UpdateDetectorRequest"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "UpdateDetectorRequest",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "UpdateDetectorRequest",
+            "templateImplType" : "java.util.ArrayList<UpdateDetectorRequest>",
+            "templateType" : "java.util.List<UpdateDetectorRequest>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Detectors",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n@param detectors The list of detectors (instances) to be updated, along with the values to be updated.*/",
+          "setterMethodName" : "setDetectors",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<UpdateDetectorRequest>",
+            "variableName" : "detectors",
+            "variableType" : "java.util.List<UpdateDetectorRequest>",
+            "documentation" : "",
+            "simpleType" : "List<UpdateDetectorRequest>",
+            "variableSetterType" : "java.util.Collection<UpdateDetectorRequest>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectors(java.util.Collection)} or {@link #withDetectors(java.util.Collection)} if you want to override the existing values.</p>\n@param detectors The list of detectors (instances) to be updated, along with the values to be updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<UpdateDetectorRequest>",
+            "variableName" : "detectors",
+            "variableType" : "java.util.List<UpdateDetectorRequest>",
+            "documentation" : "<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>",
+            "simpleType" : "List<UpdateDetectorRequest>",
+            "variableSetterType" : "java.util.Collection<UpdateDetectorRequest>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectors" ],
+      "shapeName" : "BatchUpdateDetectorRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchUpdateDetectorRequest",
+        "variableName" : "batchUpdateDetectorRequest",
+        "variableType" : "BatchUpdateDetectorRequest",
+        "documentation" : null,
+        "simpleType" : "BatchUpdateDetectorRequest",
+        "variableSetterType" : "BatchUpdateDetectorRequest"
+      },
+      "wrapper" : false
+    },
+    "BatchUpdateDetectorResult" : {
+      "c2jName" : "BatchUpdateDetectorResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "batchUpdateDetectorErrorEntries",
+        "c2jShape" : "BatchUpdateDetectorErrorEntries",
+        "deprecated" : false,
+        "documentation" : "<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n@param batchUpdateDetectorErrorEntries A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBatchUpdateDetectorErrorEntries",
+        "getterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n@return A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)*/",
+        "getterMethodName" : "getBatchUpdateDetectorErrorEntries",
+        "getterModel" : {
+          "returnType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "batchUpdateDetectorErrorEntries",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "batchUpdateDetectorErrorEntries",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "BatchUpdateDetectorErrorEntry",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "BatchUpdateDetectorErrorEntry",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "BatchUpdateDetectorErrorEntry",
+              "variableName" : "member",
+              "variableType" : "BatchUpdateDetectorErrorEntry",
+              "documentation" : "",
+              "simpleType" : "BatchUpdateDetectorErrorEntry",
+              "variableSetterType" : "BatchUpdateDetectorErrorEntry"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "BatchUpdateDetectorErrorEntry",
+              "variableName" : "member",
+              "variableType" : "BatchUpdateDetectorErrorEntry",
+              "documentation" : "",
+              "simpleType" : "BatchUpdateDetectorErrorEntry",
+              "variableSetterType" : "BatchUpdateDetectorErrorEntry"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "BatchUpdateDetectorErrorEntry",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "BatchUpdateDetectorErrorEntry",
+          "templateImplType" : "java.util.ArrayList<BatchUpdateDetectorErrorEntry>",
+          "templateType" : "java.util.List<BatchUpdateDetectorErrorEntry>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "BatchUpdateDetectorErrorEntries",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n@param batchUpdateDetectorErrorEntries A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)*/",
+        "setterMethodName" : "setBatchUpdateDetectorErrorEntries",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+          "variableName" : "batchUpdateDetectorErrorEntries",
+          "variableType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+          "documentation" : "",
+          "simpleType" : "List<BatchUpdateDetectorErrorEntry>",
+          "variableSetterType" : "java.util.Collection<BatchUpdateDetectorErrorEntry>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setBatchUpdateDetectorErrorEntries(java.util.Collection)} or {@link #withBatchUpdateDetectorErrorEntries(java.util.Collection)} if you want to override the existing values.</p>\n@param batchUpdateDetectorErrorEntries A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+          "variableName" : "batchUpdateDetectorErrorEntries",
+          "variableType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+          "documentation" : "<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>",
+          "simpleType" : "List<BatchUpdateDetectorErrorEntry>",
+          "variableSetterType" : "java.util.Collection<BatchUpdateDetectorErrorEntry>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "BatchUpdateDetectorErrorEntries" : {
+          "c2jName" : "batchUpdateDetectorErrorEntries",
+          "c2jShape" : "BatchUpdateDetectorErrorEntries",
+          "deprecated" : false,
+          "documentation" : "<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n@param batchUpdateDetectorErrorEntries A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBatchUpdateDetectorErrorEntries",
+          "getterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n@return A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)*/",
+          "getterMethodName" : "getBatchUpdateDetectorErrorEntries",
+          "getterModel" : {
+            "returnType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "batchUpdateDetectorErrorEntries",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "batchUpdateDetectorErrorEntries",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "BatchUpdateDetectorErrorEntry",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "BatchUpdateDetectorErrorEntry",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "BatchUpdateDetectorErrorEntry",
+                "variableName" : "member",
+                "variableType" : "BatchUpdateDetectorErrorEntry",
+                "documentation" : "",
+                "simpleType" : "BatchUpdateDetectorErrorEntry",
+                "variableSetterType" : "BatchUpdateDetectorErrorEntry"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "BatchUpdateDetectorErrorEntry",
+                "variableName" : "member",
+                "variableType" : "BatchUpdateDetectorErrorEntry",
+                "documentation" : "",
+                "simpleType" : "BatchUpdateDetectorErrorEntry",
+                "variableSetterType" : "BatchUpdateDetectorErrorEntry"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "BatchUpdateDetectorErrorEntry",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "BatchUpdateDetectorErrorEntry",
+            "templateImplType" : "java.util.ArrayList<BatchUpdateDetectorErrorEntry>",
+            "templateType" : "java.util.List<BatchUpdateDetectorErrorEntry>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "BatchUpdateDetectorErrorEntries",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n@param batchUpdateDetectorErrorEntries A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)*/",
+          "setterMethodName" : "setBatchUpdateDetectorErrorEntries",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+            "variableName" : "batchUpdateDetectorErrorEntries",
+            "variableType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+            "documentation" : "",
+            "simpleType" : "List<BatchUpdateDetectorErrorEntry>",
+            "variableSetterType" : "java.util.Collection<BatchUpdateDetectorErrorEntry>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setBatchUpdateDetectorErrorEntries(java.util.Collection)} or {@link #withBatchUpdateDetectorErrorEntries(java.util.Collection)} if you want to override the existing values.</p>\n@param batchUpdateDetectorErrorEntries A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+            "variableName" : "batchUpdateDetectorErrorEntries",
+            "variableType" : "java.util.List<BatchUpdateDetectorErrorEntry>",
+            "documentation" : "<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>",
+            "simpleType" : "List<BatchUpdateDetectorErrorEntry>",
+            "variableSetterType" : "java.util.Collection<BatchUpdateDetectorErrorEntry>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BatchUpdateDetectorResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchUpdateDetectorResult",
+        "variableName" : "batchUpdateDetectorResult",
+        "variableType" : "BatchUpdateDetectorResult",
+        "documentation" : null,
+        "simpleType" : "BatchUpdateDetectorResult",
+        "variableSetterType" : "BatchUpdateDetectorResult"
+      },
+      "wrapper" : false
+    },
+    "DescribeDetectorRequest" : {
+      "c2jName" : "DescribeDetectorRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DescribeDetector",
+        "locationName" : null,
+        "requestUri" : "/detectors/{detectorModelName}/keyValues/",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model whose detectors (instances) you want information about.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@param detectorModelName The name of the detector model whose detectors (instances) you want information about.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@return The name of the detector model whose detectors (instances) you want information about.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@param detectorModelName The name of the detector model whose detectors (instances) you want information about.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@param detectorModelName The name of the detector model whose detectors (instances) you want information about.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model whose detectors (instances) you want information about.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyValue",
+        "c2jShape" : "KeyValue",
+        "deprecated" : false,
+        "documentation" : "<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@param keyValue A filter used to limit results to detectors (instances) created because of the given key ID.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyValue",
+        "getterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@return A filter used to limit results to detectors (instances) created because of the given key ID.*/",
+        "getterMethodName" : "getKeyValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "keyValue",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyValue",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@param keyValue A filter used to limit results to detectors (instances) created because of the given key ID.*/",
+        "setterMethodName" : "setKeyValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@param keyValue A filter used to limit results to detectors (instances) created because of the given key ID.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model whose detectors (instances) you want information about.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@param detectorModelName The name of the detector model whose detectors (instances) you want information about.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@return The name of the detector model whose detectors (instances) you want information about.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@param detectorModelName The name of the detector model whose detectors (instances) you want information about.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model whose detectors (instances) you want information about.</p>\n@param detectorModelName The name of the detector model whose detectors (instances) you want information about.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model whose detectors (instances) you want information about.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyValue" : {
+          "c2jName" : "keyValue",
+          "c2jShape" : "KeyValue",
+          "deprecated" : false,
+          "documentation" : "<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@param keyValue A filter used to limit results to detectors (instances) created because of the given key ID.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyValue",
+          "getterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@return A filter used to limit results to detectors (instances) created because of the given key ID.*/",
+          "getterMethodName" : "getKeyValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "keyValue",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyValue",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyValue",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@param keyValue A filter used to limit results to detectors (instances) created because of the given key ID.*/",
+          "setterMethodName" : "setKeyValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>\n@param keyValue A filter used to limit results to detectors (instances) created because of the given key ID.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName" ],
+      "shapeName" : "DescribeDetectorRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeDetectorRequest",
+        "variableName" : "describeDetectorRequest",
+        "variableType" : "DescribeDetectorRequest",
+        "documentation" : null,
+        "simpleType" : "DescribeDetectorRequest",
+        "variableSetterType" : "DescribeDetectorRequest"
+      },
+      "wrapper" : false
+    },
+    "DescribeDetectorResult" : {
+      "c2jName" : "DescribeDetectorResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detector",
+        "c2jShape" : "Detector",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@param detector Information about the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetector",
+        "getterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@return Information about the detector (instance).*/",
+        "getterMethodName" : "getDetector",
+        "getterModel" : {
+          "returnType" : "Detector",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detector",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detector",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "Detector",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@param detector Information about the detector (instance).*/",
+        "setterMethodName" : "setDetector",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Detector",
+          "variableName" : "detector",
+          "variableType" : "Detector",
+          "documentation" : "",
+          "simpleType" : "Detector",
+          "variableSetterType" : "Detector"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@param detector Information about the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Detector",
+          "variableName" : "detector",
+          "variableType" : "Detector",
+          "documentation" : "<p>Information about the detector (instance).</p>",
+          "simpleType" : "Detector",
+          "variableSetterType" : "Detector"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Detector" : {
+          "c2jName" : "detector",
+          "c2jShape" : "Detector",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@param detector Information about the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetector",
+          "getterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@return Information about the detector (instance).*/",
+          "getterMethodName" : "getDetector",
+          "getterModel" : {
+            "returnType" : "Detector",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detector",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detector",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "Detector",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@param detector Information about the detector (instance).*/",
+          "setterMethodName" : "setDetector",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Detector",
+            "variableName" : "detector",
+            "variableType" : "Detector",
+            "documentation" : "",
+            "simpleType" : "Detector",
+            "variableSetterType" : "Detector"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the detector (instance).</p>\n@param detector Information about the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Detector",
+            "variableName" : "detector",
+            "variableType" : "Detector",
+            "documentation" : "<p>Information about the detector (instance).</p>",
+            "simpleType" : "Detector",
+            "variableSetterType" : "Detector"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DescribeDetectorResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeDetectorResult",
+        "variableName" : "describeDetectorResult",
+        "variableType" : "DescribeDetectorResult",
+        "documentation" : null,
+        "simpleType" : "DescribeDetectorResult",
+        "variableSetterType" : "DescribeDetectorResult"
+      },
+      "wrapper" : false
+    },
+    "Detector" : {
+      "c2jName" : "Detector",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the detector (instance).</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@return The name of the detector model that created this detector (instance).*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyValue",
+        "c2jShape" : "KeyValue",
+        "deprecated" : false,
+        "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyValue",
+        "getterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@return The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+        "getterMethodName" : "getKeyValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyValue",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyValue",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+        "setterMethodName" : "setKeyValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelVersion",
+        "c2jShape" : "DetectorModelVersion",
+        "deprecated" : false,
+        "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelVersion",
+        "getterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@return The version of the detector model that created this detector (instance).*/",
+        "getterMethodName" : "getDetectorModelVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelVersion",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelVersion",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).*/",
+        "setterMethodName" : "setDetectorModelVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "state",
+        "c2jShape" : "DetectorState",
+        "deprecated" : false,
+        "documentation" : "<p>The current state of the detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withState",
+        "getterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@return The current state of the detector (instance).*/",
+        "getterMethodName" : "getState",
+        "getterModel" : {
+          "returnType" : "DetectorState",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "state",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "state",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "State",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).*/",
+        "setterMethodName" : "setState",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorState",
+          "variableName" : "state",
+          "variableType" : "DetectorState",
+          "documentation" : "",
+          "simpleType" : "DetectorState",
+          "variableSetterType" : "DetectorState"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorState",
+          "variableName" : "state",
+          "variableType" : "DetectorState",
+          "documentation" : "<p>The current state of the detector (instance).</p>",
+          "simpleType" : "DetectorState",
+          "variableSetterType" : "DetectorState"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector (instance) was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@return The time the detector (instance) was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector (instance) was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "lastUpdateTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLastUpdateTime",
+        "getterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@return The time the detector (instance) was last updated.*/",
+        "getterMethodName" : "getLastUpdateTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "lastUpdateTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "lastUpdateTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "LastUpdateTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.*/",
+        "setterMethodName" : "setLastUpdateTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector (instance) was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@return The time the detector (instance) was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector (instance) was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@return The name of the detector model that created this detector (instance).*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelVersion" : {
+          "c2jName" : "detectorModelVersion",
+          "c2jShape" : "DetectorModelVersion",
+          "deprecated" : false,
+          "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelVersion",
+          "getterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@return The version of the detector model that created this detector (instance).*/",
+          "getterMethodName" : "getDetectorModelVersion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelVersion",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelVersion",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).*/",
+          "setterMethodName" : "setDetectorModelVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyValue" : {
+          "c2jName" : "keyValue",
+          "c2jShape" : "KeyValue",
+          "deprecated" : false,
+          "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyValue",
+          "getterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@return The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+          "getterMethodName" : "getKeyValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "keyValue",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyValue",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyValue",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+          "setterMethodName" : "setKeyValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "LastUpdateTime" : {
+          "c2jName" : "lastUpdateTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLastUpdateTime",
+          "getterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@return The time the detector (instance) was last updated.*/",
+          "getterMethodName" : "getLastUpdateTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "lastUpdateTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "lastUpdateTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "LastUpdateTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.*/",
+          "setterMethodName" : "setLastUpdateTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "State" : {
+          "c2jName" : "state",
+          "c2jShape" : "DetectorState",
+          "deprecated" : false,
+          "documentation" : "<p>The current state of the detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withState",
+          "getterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@return The current state of the detector (instance).*/",
+          "getterMethodName" : "getState",
+          "getterModel" : {
+            "returnType" : "DetectorState",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "state",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "state",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "State",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).*/",
+          "setterMethodName" : "setState",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorState",
+            "variableName" : "state",
+            "variableType" : "DetectorState",
+            "documentation" : "",
+            "simpleType" : "DetectorState",
+            "variableSetterType" : "DetectorState"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorState",
+            "variableName" : "state",
+            "variableType" : "DetectorState",
+            "documentation" : "<p>The current state of the detector (instance).</p>",
+            "simpleType" : "DetectorState",
+            "variableSetterType" : "DetectorState"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "Detector",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Detector",
+        "variableName" : "detector",
+        "variableType" : "Detector",
+        "documentation" : null,
+        "simpleType" : "Detector",
+        "variableSetterType" : "Detector"
+      },
+      "wrapper" : false
+    },
+    "DetectorState" : {
+      "c2jName" : "DetectorState",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the current state of the detector instance.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "stateName",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the state.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStateName",
+        "getterDocumentation" : "/**<p>The name of the state.</p>\n@return The name of the state.*/",
+        "getterMethodName" : "getStateName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "stateName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "stateName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StateName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.*/",
+        "setterMethodName" : "setStateName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the state.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "variables",
+        "c2jShape" : "Variables",
+        "deprecated" : false,
+        "documentation" : "<p>The current state of the detector's variables.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n@param variables The current state of the detector's variables.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withVariables",
+        "getterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n@return The current state of the detector's variables.*/",
+        "getterMethodName" : "getVariables",
+        "getterModel" : {
+          "returnType" : "java.util.List<Variable>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "variables",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "variables",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Variable",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Variable",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Variable",
+              "variableName" : "member",
+              "variableType" : "Variable",
+              "documentation" : "",
+              "simpleType" : "Variable",
+              "variableSetterType" : "Variable"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Variable",
+              "variableName" : "member",
+              "variableType" : "Variable",
+              "documentation" : "",
+              "simpleType" : "Variable",
+              "variableSetterType" : "Variable"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Variable",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Variable",
+          "templateImplType" : "java.util.ArrayList<Variable>",
+          "templateType" : "java.util.List<Variable>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Variables",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n@param variables The current state of the detector's variables.*/",
+        "setterMethodName" : "setVariables",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Variable>",
+          "variableName" : "variables",
+          "variableType" : "java.util.List<Variable>",
+          "documentation" : "",
+          "simpleType" : "List<Variable>",
+          "variableSetterType" : "java.util.Collection<Variable>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setVariables(java.util.Collection)} or {@link #withVariables(java.util.Collection)} if you want to override the existing values.</p>\n@param variables The current state of the detector's variables.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Variable>",
+          "variableName" : "variables",
+          "variableType" : "java.util.List<Variable>",
+          "documentation" : "<p>The current state of the detector's variables.</p>",
+          "simpleType" : "List<Variable>",
+          "variableSetterType" : "java.util.Collection<Variable>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "timers",
+        "c2jShape" : "Timers",
+        "deprecated" : false,
+        "documentation" : "<p>The current state of the detector's timers.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n@param timers The current state of the detector's timers.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTimers",
+        "getterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n@return The current state of the detector's timers.*/",
+        "getterMethodName" : "getTimers",
+        "getterModel" : {
+          "returnType" : "java.util.List<Timer>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "timers",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "timers",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Timer",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Timer",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Timer",
+              "variableName" : "member",
+              "variableType" : "Timer",
+              "documentation" : "",
+              "simpleType" : "Timer",
+              "variableSetterType" : "Timer"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Timer",
+              "variableName" : "member",
+              "variableType" : "Timer",
+              "documentation" : "",
+              "simpleType" : "Timer",
+              "variableSetterType" : "Timer"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Timer",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Timer",
+          "templateImplType" : "java.util.ArrayList<Timer>",
+          "templateType" : "java.util.List<Timer>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Timers",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n@param timers The current state of the detector's timers.*/",
+        "setterMethodName" : "setTimers",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Timer>",
+          "variableName" : "timers",
+          "variableType" : "java.util.List<Timer>",
+          "documentation" : "",
+          "simpleType" : "List<Timer>",
+          "variableSetterType" : "java.util.Collection<Timer>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTimers(java.util.Collection)} or {@link #withTimers(java.util.Collection)} if you want to override the existing values.</p>\n@param timers The current state of the detector's timers.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Timer>",
+          "variableName" : "timers",
+          "variableType" : "java.util.List<Timer>",
+          "documentation" : "<p>The current state of the detector's timers.</p>",
+          "simpleType" : "List<Timer>",
+          "variableSetterType" : "java.util.Collection<Timer>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "StateName" : {
+          "c2jName" : "stateName",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the state.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStateName",
+          "getterDocumentation" : "/**<p>The name of the state.</p>\n@return The name of the state.*/",
+          "getterMethodName" : "getStateName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "stateName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "stateName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "StateName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.*/",
+          "setterMethodName" : "setStateName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the state.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Timers" : {
+          "c2jName" : "timers",
+          "c2jShape" : "Timers",
+          "deprecated" : false,
+          "documentation" : "<p>The current state of the detector's timers.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n@param timers The current state of the detector's timers.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTimers",
+          "getterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n@return The current state of the detector's timers.*/",
+          "getterMethodName" : "getTimers",
+          "getterModel" : {
+            "returnType" : "java.util.List<Timer>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "timers",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "timers",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Timer",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Timer",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Timer",
+                "variableName" : "member",
+                "variableType" : "Timer",
+                "documentation" : "",
+                "simpleType" : "Timer",
+                "variableSetterType" : "Timer"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Timer",
+                "variableName" : "member",
+                "variableType" : "Timer",
+                "documentation" : "",
+                "simpleType" : "Timer",
+                "variableSetterType" : "Timer"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Timer",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Timer",
+            "templateImplType" : "java.util.ArrayList<Timer>",
+            "templateType" : "java.util.List<Timer>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Timers",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n@param timers The current state of the detector's timers.*/",
+          "setterMethodName" : "setTimers",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Timer>",
+            "variableName" : "timers",
+            "variableType" : "java.util.List<Timer>",
+            "documentation" : "",
+            "simpleType" : "List<Timer>",
+            "variableSetterType" : "java.util.Collection<Timer>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The current state of the detector's timers.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTimers(java.util.Collection)} or {@link #withTimers(java.util.Collection)} if you want to override the existing values.</p>\n@param timers The current state of the detector's timers.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Timer>",
+            "variableName" : "timers",
+            "variableType" : "java.util.List<Timer>",
+            "documentation" : "<p>The current state of the detector's timers.</p>",
+            "simpleType" : "List<Timer>",
+            "variableSetterType" : "java.util.Collection<Timer>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Variables" : {
+          "c2jName" : "variables",
+          "c2jShape" : "Variables",
+          "deprecated" : false,
+          "documentation" : "<p>The current state of the detector's variables.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n@param variables The current state of the detector's variables.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withVariables",
+          "getterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n@return The current state of the detector's variables.*/",
+          "getterMethodName" : "getVariables",
+          "getterModel" : {
+            "returnType" : "java.util.List<Variable>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "variables",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "variables",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Variable",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Variable",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Variable",
+                "variableName" : "member",
+                "variableType" : "Variable",
+                "documentation" : "",
+                "simpleType" : "Variable",
+                "variableSetterType" : "Variable"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Variable",
+                "variableName" : "member",
+                "variableType" : "Variable",
+                "documentation" : "",
+                "simpleType" : "Variable",
+                "variableSetterType" : "Variable"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Variable",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Variable",
+            "templateImplType" : "java.util.ArrayList<Variable>",
+            "templateType" : "java.util.List<Variable>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Variables",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n@param variables The current state of the detector's variables.*/",
+          "setterMethodName" : "setVariables",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Variable>",
+            "variableName" : "variables",
+            "variableType" : "java.util.List<Variable>",
+            "documentation" : "",
+            "simpleType" : "List<Variable>",
+            "variableSetterType" : "java.util.Collection<Variable>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The current state of the detector's variables.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setVariables(java.util.Collection)} or {@link #withVariables(java.util.Collection)} if you want to override the existing values.</p>\n@param variables The current state of the detector's variables.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Variable>",
+            "variableName" : "variables",
+            "variableType" : "java.util.List<Variable>",
+            "documentation" : "<p>The current state of the detector's variables.</p>",
+            "simpleType" : "List<Variable>",
+            "variableSetterType" : "java.util.Collection<Variable>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "stateName", "variables", "timers" ],
+      "shapeName" : "DetectorState",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorState",
+        "variableName" : "detectorState",
+        "variableType" : "DetectorState",
+        "documentation" : null,
+        "simpleType" : "DetectorState",
+        "variableSetterType" : "DetectorState"
+      },
+      "wrapper" : false
+    },
+    "DetectorStateDefinition" : {
+      "c2jName" : "DetectorStateDefinition",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The new state, variable values and timer settings of the detector (instance).</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "stateName",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the new state of the detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@param stateName The name of the new state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStateName",
+        "getterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@return The name of the new state of the detector (instance).*/",
+        "getterMethodName" : "getStateName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "stateName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "stateName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StateName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@param stateName The name of the new state of the detector (instance).*/",
+        "setterMethodName" : "setStateName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@param stateName The name of the new state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the new state of the detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "variables",
+        "c2jShape" : "VariableDefinitions",
+        "deprecated" : false,
+        "documentation" : "<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n@param variables The new values of the detector's variables. Any variable whose value is not specified will be cleared.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withVariables",
+        "getterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n@return The new values of the detector's variables. Any variable whose value is not specified will be cleared.*/",
+        "getterMethodName" : "getVariables",
+        "getterModel" : {
+          "returnType" : "java.util.List<VariableDefinition>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "variables",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "variables",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "VariableDefinition",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "VariableDefinition",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "VariableDefinition",
+              "variableName" : "member",
+              "variableType" : "VariableDefinition",
+              "documentation" : "",
+              "simpleType" : "VariableDefinition",
+              "variableSetterType" : "VariableDefinition"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "VariableDefinition",
+              "variableName" : "member",
+              "variableType" : "VariableDefinition",
+              "documentation" : "",
+              "simpleType" : "VariableDefinition",
+              "variableSetterType" : "VariableDefinition"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "VariableDefinition",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "VariableDefinition",
+          "templateImplType" : "java.util.ArrayList<VariableDefinition>",
+          "templateType" : "java.util.List<VariableDefinition>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Variables",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n@param variables The new values of the detector's variables. Any variable whose value is not specified will be cleared.*/",
+        "setterMethodName" : "setVariables",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<VariableDefinition>",
+          "variableName" : "variables",
+          "variableType" : "java.util.List<VariableDefinition>",
+          "documentation" : "",
+          "simpleType" : "List<VariableDefinition>",
+          "variableSetterType" : "java.util.Collection<VariableDefinition>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setVariables(java.util.Collection)} or {@link #withVariables(java.util.Collection)} if you want to override the existing values.</p>\n@param variables The new values of the detector's variables. Any variable whose value is not specified will be cleared.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<VariableDefinition>",
+          "variableName" : "variables",
+          "variableType" : "java.util.List<VariableDefinition>",
+          "documentation" : "<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>",
+          "simpleType" : "List<VariableDefinition>",
+          "variableSetterType" : "java.util.Collection<VariableDefinition>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "timers",
+        "c2jShape" : "TimerDefinitions",
+        "deprecated" : false,
+        "documentation" : "<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n@param timers The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTimers",
+        "getterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n@return The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.*/",
+        "getterMethodName" : "getTimers",
+        "getterModel" : {
+          "returnType" : "java.util.List<TimerDefinition>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "timers",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "timers",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "TimerDefinition",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "TimerDefinition",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "TimerDefinition",
+              "variableName" : "member",
+              "variableType" : "TimerDefinition",
+              "documentation" : "",
+              "simpleType" : "TimerDefinition",
+              "variableSetterType" : "TimerDefinition"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "TimerDefinition",
+              "variableName" : "member",
+              "variableType" : "TimerDefinition",
+              "documentation" : "",
+              "simpleType" : "TimerDefinition",
+              "variableSetterType" : "TimerDefinition"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "TimerDefinition",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "TimerDefinition",
+          "templateImplType" : "java.util.ArrayList<TimerDefinition>",
+          "templateType" : "java.util.List<TimerDefinition>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Timers",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n@param timers The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.*/",
+        "setterMethodName" : "setTimers",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<TimerDefinition>",
+          "variableName" : "timers",
+          "variableType" : "java.util.List<TimerDefinition>",
+          "documentation" : "",
+          "simpleType" : "List<TimerDefinition>",
+          "variableSetterType" : "java.util.Collection<TimerDefinition>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTimers(java.util.Collection)} or {@link #withTimers(java.util.Collection)} if you want to override the existing values.</p>\n@param timers The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<TimerDefinition>",
+          "variableName" : "timers",
+          "variableType" : "java.util.List<TimerDefinition>",
+          "documentation" : "<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>",
+          "simpleType" : "List<TimerDefinition>",
+          "variableSetterType" : "java.util.Collection<TimerDefinition>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "StateName" : {
+          "c2jName" : "stateName",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the new state of the detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@param stateName The name of the new state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStateName",
+          "getterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@return The name of the new state of the detector (instance).*/",
+          "getterMethodName" : "getStateName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "stateName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "stateName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "StateName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@param stateName The name of the new state of the detector (instance).*/",
+          "setterMethodName" : "setStateName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the new state of the detector (instance).</p>\n@param stateName The name of the new state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the new state of the detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Timers" : {
+          "c2jName" : "timers",
+          "c2jShape" : "TimerDefinitions",
+          "deprecated" : false,
+          "documentation" : "<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n@param timers The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTimers",
+          "getterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n@return The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.*/",
+          "getterMethodName" : "getTimers",
+          "getterModel" : {
+            "returnType" : "java.util.List<TimerDefinition>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "timers",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "timers",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "TimerDefinition",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "TimerDefinition",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "TimerDefinition",
+                "variableName" : "member",
+                "variableType" : "TimerDefinition",
+                "documentation" : "",
+                "simpleType" : "TimerDefinition",
+                "variableSetterType" : "TimerDefinition"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "TimerDefinition",
+                "variableName" : "member",
+                "variableType" : "TimerDefinition",
+                "documentation" : "",
+                "simpleType" : "TimerDefinition",
+                "variableSetterType" : "TimerDefinition"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "TimerDefinition",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "TimerDefinition",
+            "templateImplType" : "java.util.ArrayList<TimerDefinition>",
+            "templateType" : "java.util.List<TimerDefinition>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Timers",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n@param timers The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.*/",
+          "setterMethodName" : "setTimers",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<TimerDefinition>",
+            "variableName" : "timers",
+            "variableType" : "java.util.List<TimerDefinition>",
+            "documentation" : "",
+            "simpleType" : "List<TimerDefinition>",
+            "variableSetterType" : "java.util.Collection<TimerDefinition>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTimers(java.util.Collection)} or {@link #withTimers(java.util.Collection)} if you want to override the existing values.</p>\n@param timers The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<TimerDefinition>",
+            "variableName" : "timers",
+            "variableType" : "java.util.List<TimerDefinition>",
+            "documentation" : "<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>",
+            "simpleType" : "List<TimerDefinition>",
+            "variableSetterType" : "java.util.Collection<TimerDefinition>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Variables" : {
+          "c2jName" : "variables",
+          "c2jShape" : "VariableDefinitions",
+          "deprecated" : false,
+          "documentation" : "<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n@param variables The new values of the detector's variables. Any variable whose value is not specified will be cleared.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withVariables",
+          "getterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n@return The new values of the detector's variables. Any variable whose value is not specified will be cleared.*/",
+          "getterMethodName" : "getVariables",
+          "getterModel" : {
+            "returnType" : "java.util.List<VariableDefinition>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "variables",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "variables",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "VariableDefinition",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "VariableDefinition",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "VariableDefinition",
+                "variableName" : "member",
+                "variableType" : "VariableDefinition",
+                "documentation" : "",
+                "simpleType" : "VariableDefinition",
+                "variableSetterType" : "VariableDefinition"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "VariableDefinition",
+                "variableName" : "member",
+                "variableType" : "VariableDefinition",
+                "documentation" : "",
+                "simpleType" : "VariableDefinition",
+                "variableSetterType" : "VariableDefinition"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "VariableDefinition",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "VariableDefinition",
+            "templateImplType" : "java.util.ArrayList<VariableDefinition>",
+            "templateType" : "java.util.List<VariableDefinition>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Variables",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n@param variables The new values of the detector's variables. Any variable whose value is not specified will be cleared.*/",
+          "setterMethodName" : "setVariables",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<VariableDefinition>",
+            "variableName" : "variables",
+            "variableType" : "java.util.List<VariableDefinition>",
+            "documentation" : "",
+            "simpleType" : "List<VariableDefinition>",
+            "variableSetterType" : "java.util.Collection<VariableDefinition>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setVariables(java.util.Collection)} or {@link #withVariables(java.util.Collection)} if you want to override the existing values.</p>\n@param variables The new values of the detector's variables. Any variable whose value is not specified will be cleared.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<VariableDefinition>",
+            "variableName" : "variables",
+            "variableType" : "java.util.List<VariableDefinition>",
+            "documentation" : "<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>",
+            "simpleType" : "List<VariableDefinition>",
+            "variableSetterType" : "java.util.Collection<VariableDefinition>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "stateName", "variables", "timers" ],
+      "shapeName" : "DetectorStateDefinition",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorStateDefinition",
+        "variableName" : "detectorStateDefinition",
+        "variableType" : "DetectorStateDefinition",
+        "documentation" : null,
+        "simpleType" : "DetectorStateDefinition",
+        "variableSetterType" : "DetectorStateDefinition"
+      },
+      "wrapper" : false
+    },
+    "DetectorStateSummary" : {
+      "c2jName" : "DetectorStateSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the detector state.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "stateName",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the state.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStateName",
+        "getterDocumentation" : "/**<p>The name of the state.</p>\n@return The name of the state.*/",
+        "getterMethodName" : "getStateName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "stateName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "stateName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StateName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.*/",
+        "setterMethodName" : "setStateName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the state.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "StateName" : {
+          "c2jName" : "stateName",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the state.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStateName",
+          "getterDocumentation" : "/**<p>The name of the state.</p>\n@return The name of the state.*/",
+          "getterMethodName" : "getStateName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "stateName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "stateName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "StateName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.*/",
+          "setterMethodName" : "setStateName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the state.</p>\n@param stateName The name of the state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the state.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorStateSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorStateSummary",
+        "variableName" : "detectorStateSummary",
+        "variableType" : "DetectorStateSummary",
+        "documentation" : null,
+        "simpleType" : "DetectorStateSummary",
+        "variableSetterType" : "DetectorStateSummary"
+      },
+      "wrapper" : false
+    },
+    "DetectorSummary" : {
+      "c2jName" : "DetectorSummary",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about the detector (instance).</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@return The name of the detector model that created this detector (instance).*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyValue",
+        "c2jShape" : "KeyValue",
+        "deprecated" : false,
+        "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyValue",
+        "getterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@return The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+        "getterMethodName" : "getKeyValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyValue",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyValue",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+        "setterMethodName" : "setKeyValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelVersion",
+        "c2jShape" : "DetectorModelVersion",
+        "deprecated" : false,
+        "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelVersion",
+        "getterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@return The version of the detector model that created this detector (instance).*/",
+        "getterMethodName" : "getDetectorModelVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelVersion",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelVersion",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).*/",
+        "setterMethodName" : "setDetectorModelVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelVersion",
+          "variableType" : "String",
+          "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "state",
+        "c2jShape" : "DetectorStateSummary",
+        "deprecated" : false,
+        "documentation" : "<p>The current state of the detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withState",
+        "getterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@return The current state of the detector (instance).*/",
+        "getterMethodName" : "getState",
+        "getterModel" : {
+          "returnType" : "DetectorStateSummary",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "state",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "state",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "State",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).*/",
+        "setterMethodName" : "setState",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorStateSummary",
+          "variableName" : "state",
+          "variableType" : "DetectorStateSummary",
+          "documentation" : "",
+          "simpleType" : "DetectorStateSummary",
+          "variableSetterType" : "DetectorStateSummary"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorStateSummary",
+          "variableName" : "state",
+          "variableType" : "DetectorStateSummary",
+          "documentation" : "<p>The current state of the detector (instance).</p>",
+          "simpleType" : "DetectorStateSummary",
+          "variableSetterType" : "DetectorStateSummary"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "creationTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector (instance) was created.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@return The time the detector (instance) was created.*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector (instance) was created.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "lastUpdateTime",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLastUpdateTime",
+        "getterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@return The time the detector (instance) was last updated.*/",
+        "getterMethodName" : "getLastUpdateTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "lastUpdateTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "lastUpdateTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "LastUpdateTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.*/",
+        "setterMethodName" : "setLastUpdateTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "lastUpdateTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CreationTime" : {
+          "c2jName" : "creationTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector (instance) was created.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@return The time the detector (instance) was created.*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector (instance) was created.</p>\n@param creationTime The time the detector (instance) was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector (instance) was created.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@return The name of the detector model that created this detector (instance).*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model that created this detector (instance).</p>\n@param detectorModelName The name of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model that created this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DetectorModelVersion" : {
+          "c2jName" : "detectorModelVersion",
+          "c2jShape" : "DetectorModelVersion",
+          "deprecated" : false,
+          "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelVersion",
+          "getterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@return The version of the detector model that created this detector (instance).*/",
+          "getterMethodName" : "getDetectorModelVersion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelVersion",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelVersion",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).*/",
+          "setterMethodName" : "setDetectorModelVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The version of the detector model that created this detector (instance).</p>\n@param detectorModelVersion The version of the detector model that created this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelVersion",
+            "variableType" : "String",
+            "documentation" : "<p>The version of the detector model that created this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyValue" : {
+          "c2jName" : "keyValue",
+          "c2jShape" : "KeyValue",
+          "deprecated" : false,
+          "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyValue",
+          "getterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@return The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+          "getterMethodName" : "getKeyValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "keyValue",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyValue",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyValue",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).*/",
+          "setterMethodName" : "setKeyValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the key (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "LastUpdateTime" : {
+          "c2jName" : "lastUpdateTime",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLastUpdateTime",
+          "getterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@return The time the detector (instance) was last updated.*/",
+          "getterMethodName" : "getLastUpdateTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "lastUpdateTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "lastUpdateTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "LastUpdateTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.*/",
+          "setterMethodName" : "setLastUpdateTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The time the detector (instance) was last updated.</p>\n@param lastUpdateTime The time the detector (instance) was last updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "lastUpdateTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The time the detector (instance) was last updated.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "State" : {
+          "c2jName" : "state",
+          "c2jShape" : "DetectorStateSummary",
+          "deprecated" : false,
+          "documentation" : "<p>The current state of the detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withState",
+          "getterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@return The current state of the detector (instance).*/",
+          "getterMethodName" : "getState",
+          "getterModel" : {
+            "returnType" : "DetectorStateSummary",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "state",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "state",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "State",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).*/",
+          "setterMethodName" : "setState",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorStateSummary",
+            "variableName" : "state",
+            "variableType" : "DetectorStateSummary",
+            "documentation" : "",
+            "simpleType" : "DetectorStateSummary",
+            "variableSetterType" : "DetectorStateSummary"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The current state of the detector (instance).</p>\n@param state The current state of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorStateSummary",
+            "variableName" : "state",
+            "variableType" : "DetectorStateSummary",
+            "documentation" : "<p>The current state of the detector (instance).</p>",
+            "simpleType" : "DetectorStateSummary",
+            "variableSetterType" : "DetectorStateSummary"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DetectorSummary",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DetectorSummary",
+        "variableName" : "detectorSummary",
+        "variableType" : "DetectorSummary",
+        "documentation" : null,
+        "simpleType" : "DetectorSummary",
+        "variableSetterType" : "DetectorSummary"
+      },
+      "wrapper" : false
+    },
+    "ErrorCode" : {
+      "c2jName" : "ErrorCode",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "ResourceNotFoundException",
+        "value" : "ResourceNotFoundException"
+      }, {
+        "name" : "InvalidRequestException",
+        "value" : "InvalidRequestException"
+      }, {
+        "name" : "InternalFailureException",
+        "value" : "InternalFailureException"
+      }, {
+        "name" : "ServiceUnavailableException",
+        "value" : "ServiceUnavailableException"
+      }, {
+        "name" : "ThrottlingException",
+        "value" : "ThrottlingException"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ErrorCode",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ErrorCode",
+        "variableName" : "errorCode",
+        "variableType" : "ErrorCode",
+        "documentation" : null,
+        "simpleType" : "ErrorCode",
+        "variableSetterType" : "ErrorCode"
+      },
+      "wrapper" : false
+    },
+    "InternalFailureException" : {
+      "c2jName" : "InternalFailureException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>An internal failure occured.</p>",
+      "enums" : null,
+      "errorCode" : "InternalFailureException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InternalFailureException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InternalFailureException",
+        "variableName" : "internalFailureException",
+        "variableType" : "InternalFailureException",
+        "documentation" : null,
+        "simpleType" : "InternalFailureException",
+        "variableSetterType" : "InternalFailureException"
+      },
+      "wrapper" : false
+    },
+    "InvalidRequestException" : {
+      "c2jName" : "InvalidRequestException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request was invalid.</p>",
+      "enums" : null,
+      "errorCode" : "InvalidRequestException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InvalidRequestException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InvalidRequestException",
+        "variableName" : "invalidRequestException",
+        "variableType" : "InvalidRequestException",
+        "documentation" : null,
+        "simpleType" : "InvalidRequestException",
+        "variableSetterType" : "InvalidRequestException"
+      },
+      "wrapper" : false
+    },
+    "ListDetectorsRequest" : {
+      "c2jName" : "ListDetectorsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListDetectors",
+        "locationName" : null,
+        "requestUri" : "/detectors/{detectorModelName}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model whose instances you want to list.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@param detectorModelName The name of the detector model whose instances you want to list.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@return The name of the detector model whose instances you want to list.*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@param detectorModelName The name of the detector model whose instances you want to list.*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@param detectorModelName The name of the detector model whose instances you want to list.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model whose instances you want to list.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "stateName",
+        "c2jShape" : "StateName",
+        "deprecated" : false,
+        "documentation" : "<p>A filter that limits results to those detectors (instances) in the given state.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@param stateName A filter that limits results to those detectors (instances) in the given state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStateName",
+        "getterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@return A filter that limits results to those detectors (instances) in the given state.*/",
+        "getterMethodName" : "getStateName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "stateName",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "stateName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StateName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@param stateName A filter that limits results to those detectors (instances) in the given state.*/",
+        "setterMethodName" : "setStateName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@param stateName A filter that limits results to those detectors (instances) in the given state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stateName",
+          "variableType" : "String",
+          "documentation" : "<p>A filter that limits results to those detectors (instances) in the given state.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>The token for the next set of results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "maxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "<p>The maximum number of results to return at one time.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model whose instances you want to list.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@param detectorModelName The name of the detector model whose instances you want to list.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@return The name of the detector model whose instances you want to list.*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@param detectorModelName The name of the detector model whose instances you want to list.*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model whose instances you want to list.</p>\n@param detectorModelName The name of the detector model whose instances you want to list.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model whose instances you want to list.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MaxResults" : {
+          "c2jName" : "maxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "<p>The maximum number of results to return at one time.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@return The maximum number of results to return at one time.*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The maximum number of results to return at one time.</p>\n@param maxResults The maximum number of results to return at one time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "<p>The maximum number of results to return at one time.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>The token for the next set of results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>The token for the next set of results.</p>\n@return The token for the next set of results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The token for the next set of results.</p>\n@param nextToken The token for the next set of results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>The token for the next set of results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "StateName" : {
+          "c2jName" : "stateName",
+          "c2jShape" : "StateName",
+          "deprecated" : false,
+          "documentation" : "<p>A filter that limits results to those detectors (instances) in the given state.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@param stateName A filter that limits results to those detectors (instances) in the given state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStateName",
+          "getterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@return A filter that limits results to those detectors (instances) in the given state.*/",
+          "getterMethodName" : "getStateName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "stateName",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "stateName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "StateName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@param stateName A filter that limits results to those detectors (instances) in the given state.*/",
+          "setterMethodName" : "setStateName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A filter that limits results to those detectors (instances) in the given state.</p>\n@param stateName A filter that limits results to those detectors (instances) in the given state.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stateName",
+            "variableType" : "String",
+            "documentation" : "<p>A filter that limits results to those detectors (instances) in the given state.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "detectorModelName" ],
+      "shapeName" : "ListDetectorsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorsRequest",
+        "variableName" : "listDetectorsRequest",
+        "variableType" : "ListDetectorsRequest",
+        "documentation" : null,
+        "simpleType" : "ListDetectorsRequest",
+        "variableSetterType" : "ListDetectorsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListDetectorsResult" : {
+      "c2jName" : "ListDetectorsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "detectorSummaries",
+        "c2jShape" : "DetectorSummaries",
+        "deprecated" : false,
+        "documentation" : "<p>A list of summary information about the detectors (instances).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n@param detectorSummaries A list of summary information about the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorSummaries",
+        "getterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n@return A list of summary information about the detectors (instances).*/",
+        "getterMethodName" : "getDetectorSummaries",
+        "getterModel" : {
+          "returnType" : "java.util.List<DetectorSummary>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorSummaries",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorSummaries",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "DetectorSummary",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "DetectorSummary",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorSummary",
+              "variableName" : "member",
+              "variableType" : "DetectorSummary",
+              "documentation" : "",
+              "simpleType" : "DetectorSummary",
+              "variableSetterType" : "DetectorSummary"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "DetectorSummary",
+              "variableName" : "member",
+              "variableType" : "DetectorSummary",
+              "documentation" : "",
+              "simpleType" : "DetectorSummary",
+              "variableSetterType" : "DetectorSummary"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "DetectorSummary",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "DetectorSummary",
+          "templateImplType" : "java.util.ArrayList<DetectorSummary>",
+          "templateType" : "java.util.List<DetectorSummary>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "DetectorSummaries",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n@param detectorSummaries A list of summary information about the detectors (instances).*/",
+        "setterMethodName" : "setDetectorSummaries",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorSummary>",
+          "variableName" : "detectorSummaries",
+          "variableType" : "java.util.List<DetectorSummary>",
+          "documentation" : "",
+          "simpleType" : "List<DetectorSummary>",
+          "variableSetterType" : "java.util.Collection<DetectorSummary>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorSummaries(java.util.Collection)} or {@link #withDetectorSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorSummaries A list of summary information about the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<DetectorSummary>",
+          "variableName" : "detectorSummaries",
+          "variableType" : "java.util.List<DetectorSummary>",
+          "documentation" : "<p>A list of summary information about the detectors (instances).</p>",
+          "simpleType" : "List<DetectorSummary>",
+          "variableSetterType" : "java.util.Collection<DetectorSummary>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nextToken",
+        "c2jShape" : "NextToken",
+        "deprecated" : false,
+        "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorSummaries" : {
+          "c2jName" : "detectorSummaries",
+          "c2jShape" : "DetectorSummaries",
+          "deprecated" : false,
+          "documentation" : "<p>A list of summary information about the detectors (instances).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n@param detectorSummaries A list of summary information about the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorSummaries",
+          "getterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n@return A list of summary information about the detectors (instances).*/",
+          "getterMethodName" : "getDetectorSummaries",
+          "getterModel" : {
+            "returnType" : "java.util.List<DetectorSummary>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorSummaries",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorSummaries",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "DetectorSummary",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "DetectorSummary",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorSummary",
+                "variableName" : "member",
+                "variableType" : "DetectorSummary",
+                "documentation" : "",
+                "simpleType" : "DetectorSummary",
+                "variableSetterType" : "DetectorSummary"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "DetectorSummary",
+                "variableName" : "member",
+                "variableType" : "DetectorSummary",
+                "documentation" : "",
+                "simpleType" : "DetectorSummary",
+                "variableSetterType" : "DetectorSummary"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "DetectorSummary",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "DetectorSummary",
+            "templateImplType" : "java.util.ArrayList<DetectorSummary>",
+            "templateType" : "java.util.List<DetectorSummary>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "DetectorSummaries",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n@param detectorSummaries A list of summary information about the detectors (instances).*/",
+          "setterMethodName" : "setDetectorSummaries",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorSummary>",
+            "variableName" : "detectorSummaries",
+            "variableType" : "java.util.List<DetectorSummary>",
+            "documentation" : "",
+            "simpleType" : "List<DetectorSummary>",
+            "variableSetterType" : "java.util.Collection<DetectorSummary>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A list of summary information about the detectors (instances).</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setDetectorSummaries(java.util.Collection)} or {@link #withDetectorSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param detectorSummaries A list of summary information about the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<DetectorSummary>",
+            "variableName" : "detectorSummaries",
+            "variableType" : "java.util.List<DetectorSummary>",
+            "documentation" : "<p>A list of summary information about the detectors (instances).</p>",
+            "simpleType" : "List<DetectorSummary>",
+            "variableSetterType" : "java.util.Collection<DetectorSummary>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "nextToken",
+          "c2jShape" : "NextToken",
+          "deprecated" : false,
+          "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@return A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>\n@param nextToken A token to retrieve the next set of results, or <code>null</code> if there are no additional results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListDetectorsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListDetectorsResult",
+        "variableName" : "listDetectorsResult",
+        "variableType" : "ListDetectorsResult",
+        "documentation" : null,
+        "simpleType" : "ListDetectorsResult",
+        "variableSetterType" : "ListDetectorsResult"
+      },
+      "wrapper" : false
+    },
+    "Message" : {
+      "c2jName" : "Message",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information about a message.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "messageId",
+        "c2jShape" : "MessageId",
+        "deprecated" : false,
+        "documentation" : "<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMessageId",
+        "getterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@return The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.*/",
+        "getterMethodName" : "getMessageId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "messageId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "messageId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "MessageId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.*/",
+        "setterMethodName" : "setMessageId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "inputName",
+        "c2jShape" : "InputName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the input into which the message payload will be transformed.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@param inputName The name of the input into which the message payload will be transformed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInputName",
+        "getterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@return The name of the input into which the message payload will be transformed.*/",
+        "getterMethodName" : "getInputName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "inputName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "inputName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InputName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@param inputName The name of the input into which the message payload will be transformed.*/",
+        "setterMethodName" : "setInputName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@param inputName The name of the input into which the message payload will be transformed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "inputName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the input into which the message payload will be transformed.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "payload",
+        "c2jShape" : "Payload",
+        "deprecated" : false,
+        "documentation" : "<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param payload The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPayload",
+        "getterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).*/",
+        "getterMethodName" : "getPayload",
+        "getterModel" : {
+          "returnType" : "java.nio.ByteBuffer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "payload",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "payload",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.nio.ByteBuffer",
+        "marshallingType" : "BYTE_BUFFER",
+        "name" : "Payload",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param payload The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).*/",
+        "setterMethodName" : "setPayload",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "payload",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>\n@param payload The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "payload",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InputName" : {
+          "c2jName" : "inputName",
+          "c2jShape" : "InputName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the input into which the message payload will be transformed.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@param inputName The name of the input into which the message payload will be transformed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInputName",
+          "getterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@return The name of the input into which the message payload will be transformed.*/",
+          "getterMethodName" : "getInputName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "inputName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "inputName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InputName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@param inputName The name of the input into which the message payload will be transformed.*/",
+          "setterMethodName" : "setInputName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the input into which the message payload will be transformed.</p>\n@param inputName The name of the input into which the message payload will be transformed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "inputName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the input into which the message payload will be transformed.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MessageId" : {
+          "c2jName" : "messageId",
+          "c2jShape" : "MessageId",
+          "deprecated" : false,
+          "documentation" : "<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMessageId",
+          "getterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@return The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.*/",
+          "getterMethodName" : "getMessageId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "messageId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "messageId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "MessageId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.*/",
+          "setterMethodName" : "setMessageId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Payload" : {
+          "c2jName" : "payload",
+          "c2jShape" : "Payload",
+          "deprecated" : false,
+          "documentation" : "<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param payload The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPayload",
+          "getterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).*/",
+          "getterMethodName" : "getPayload",
+          "getterModel" : {
+            "returnType" : "java.nio.ByteBuffer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "payload",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "payload",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.nio.ByteBuffer",
+          "marshallingType" : "BYTE_BUFFER",
+          "name" : "Payload",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param payload The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).*/",
+          "setterMethodName" : "setPayload",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "payload",
+            "variableType" : "java.nio.ByteBuffer",
+            "documentation" : "",
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>\n@param payload The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "payload",
+            "variableType" : "java.nio.ByteBuffer",
+            "documentation" : "<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>",
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "messageId", "inputName", "payload" ],
+      "shapeName" : "Message",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Message",
+        "variableName" : "message",
+        "variableType" : "Message",
+        "documentation" : null,
+        "simpleType" : "Message",
+        "variableSetterType" : "Message"
+      },
+      "wrapper" : false
+    },
+    "ResourceNotFoundException" : {
+      "c2jName" : "ResourceNotFoundException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The resource was not found.</p>",
+      "enums" : null,
+      "errorCode" : "ResourceNotFoundException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ResourceNotFoundException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ResourceNotFoundException",
+        "variableName" : "resourceNotFoundException",
+        "variableType" : "ResourceNotFoundException",
+        "documentation" : null,
+        "simpleType" : "ResourceNotFoundException",
+        "variableSetterType" : "ResourceNotFoundException"
+      },
+      "wrapper" : false
+    },
+    "ServiceUnavailableException" : {
+      "c2jName" : "ServiceUnavailableException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The service is currently unavailable.</p>",
+      "enums" : null,
+      "errorCode" : "ServiceUnavailableException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceUnavailableException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceUnavailableException",
+        "variableName" : "serviceUnavailableException",
+        "variableType" : "ServiceUnavailableException",
+        "documentation" : null,
+        "simpleType" : "ServiceUnavailableException",
+        "variableSetterType" : "ServiceUnavailableException"
+      },
+      "wrapper" : false
+    },
+    "ThrottlingException" : {
+      "c2jName" : "ThrottlingException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request could not be completed due to throttling.</p>",
+      "enums" : null,
+      "errorCode" : "ThrottlingException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ThrottlingException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ThrottlingException",
+        "variableName" : "throttlingException",
+        "variableType" : "ThrottlingException",
+        "documentation" : null,
+        "simpleType" : "ThrottlingException",
+        "variableSetterType" : "ThrottlingException"
+      },
+      "wrapper" : false
+    },
+    "Timer" : {
+      "c2jName" : "Timer",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The current state of a timer.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "name",
+        "c2jShape" : "TimerName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**<p>The name of the timer.</p>\n@return The name of the timer.*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the timer.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "timestamp",
+        "c2jShape" : "Timestamp",
+        "deprecated" : false,
+        "documentation" : "<p>The number of seconds which have elapsed on the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@param timestamp The number of seconds which have elapsed on the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTimestamp",
+        "getterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@return The number of seconds which have elapsed on the timer.*/",
+        "getterMethodName" : "getTimestamp",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "timestamp",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "timestamp",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "Timestamp",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@param timestamp The number of seconds which have elapsed on the timer.*/",
+        "setterMethodName" : "setTimestamp",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "timestamp",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@param timestamp The number of seconds which have elapsed on the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "unixTimestamp",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "timestamp",
+          "variableType" : "java.util.Date",
+          "documentation" : "<p>The number of seconds which have elapsed on the timer.</p>",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Name" : {
+          "c2jName" : "name",
+          "c2jShape" : "TimerName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**<p>The name of the timer.</p>\n@return The name of the timer.*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the timer.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Timestamp" : {
+          "c2jName" : "timestamp",
+          "c2jShape" : "Timestamp",
+          "deprecated" : false,
+          "documentation" : "<p>The number of seconds which have elapsed on the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@param timestamp The number of seconds which have elapsed on the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTimestamp",
+          "getterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@return The number of seconds which have elapsed on the timer.*/",
+          "getterMethodName" : "getTimestamp",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "timestamp",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "timestamp",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "Timestamp",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@param timestamp The number of seconds which have elapsed on the timer.*/",
+          "setterMethodName" : "setTimestamp",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "timestamp",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The number of seconds which have elapsed on the timer.</p>\n@param timestamp The number of seconds which have elapsed on the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "unixTimestamp",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "timestamp",
+            "variableType" : "java.util.Date",
+            "documentation" : "<p>The number of seconds which have elapsed on the timer.</p>",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "name", "timestamp" ],
+      "shapeName" : "Timer",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Timer",
+        "variableName" : "timer",
+        "variableType" : "Timer",
+        "documentation" : null,
+        "simpleType" : "Timer",
+        "variableSetterType" : "Timer"
+      },
+      "wrapper" : false
+    },
+    "TimerDefinition" : {
+      "c2jName" : "TimerDefinition",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The new setting of a timer.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "name",
+        "c2jShape" : "TimerName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the timer.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**<p>The name of the timer.</p>\n@return The name of the timer.*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the timer.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "seconds",
+        "c2jShape" : "Seconds",
+        "deprecated" : false,
+        "documentation" : "<p>The new setting of the timer (the number of seconds before the timer elapses).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@param seconds The new setting of the timer (the number of seconds before the timer elapses).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSeconds",
+        "getterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@return The new setting of the timer (the number of seconds before the timer elapses).*/",
+        "getterMethodName" : "getSeconds",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "seconds",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "seconds",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "Seconds",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@param seconds The new setting of the timer (the number of seconds before the timer elapses).*/",
+        "setterMethodName" : "setSeconds",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "seconds",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@param seconds The new setting of the timer (the number of seconds before the timer elapses).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "seconds",
+          "variableType" : "Integer",
+          "documentation" : "<p>The new setting of the timer (the number of seconds before the timer elapses).</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Name" : {
+          "c2jName" : "name",
+          "c2jShape" : "TimerName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the timer.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**<p>The name of the timer.</p>\n@return The name of the timer.*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the timer.</p>\n@param name The name of the timer.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the timer.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Seconds" : {
+          "c2jName" : "seconds",
+          "c2jShape" : "Seconds",
+          "deprecated" : false,
+          "documentation" : "<p>The new setting of the timer (the number of seconds before the timer elapses).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@param seconds The new setting of the timer (the number of seconds before the timer elapses).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSeconds",
+          "getterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@return The new setting of the timer (the number of seconds before the timer elapses).*/",
+          "getterMethodName" : "getSeconds",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "seconds",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "seconds",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "Seconds",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@param seconds The new setting of the timer (the number of seconds before the timer elapses).*/",
+          "setterMethodName" : "setSeconds",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "seconds",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new setting of the timer (the number of seconds before the timer elapses).</p>\n@param seconds The new setting of the timer (the number of seconds before the timer elapses).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "seconds",
+            "variableType" : "Integer",
+            "documentation" : "<p>The new setting of the timer (the number of seconds before the timer elapses).</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "name", "seconds" ],
+      "shapeName" : "TimerDefinition",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TimerDefinition",
+        "variableName" : "timerDefinition",
+        "variableType" : "TimerDefinition",
+        "documentation" : null,
+        "simpleType" : "TimerDefinition",
+        "variableSetterType" : "TimerDefinition"
+      },
+      "wrapper" : false
+    },
+    "UpdateDetectorRequest" : {
+      "c2jName" : "UpdateDetectorRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Information used to update the detector (instance).</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "messageId",
+        "c2jShape" : "MessageId",
+        "deprecated" : false,
+        "documentation" : "<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMessageId",
+        "getterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@return The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.*/",
+        "getterMethodName" : "getMessageId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "messageId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "messageId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "MessageId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.*/",
+        "setterMethodName" : "setMessageId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "messageId",
+          "variableType" : "String",
+          "documentation" : "<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "detectorModelName",
+        "c2jShape" : "DetectorModelName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the detector model that created the detectors (instances).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@param detectorModelName The name of the detector model that created the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDetectorModelName",
+        "getterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@return The name of the detector model that created the detectors (instances).*/",
+        "getterMethodName" : "getDetectorModelName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "detectorModelName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "detectorModelName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DetectorModelName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@param detectorModelName The name of the detector model that created the detectors (instances).*/",
+        "setterMethodName" : "setDetectorModelName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@param detectorModelName The name of the detector model that created the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "detectorModelName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the detector model that created the detectors (instances).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "keyValue",
+        "c2jShape" : "KeyValue",
+        "deprecated" : false,
+        "documentation" : "<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKeyValue",
+        "getterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@return The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).*/",
+        "getterMethodName" : "getKeyValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "keyValue",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "keyValue",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KeyValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).*/",
+        "setterMethodName" : "setKeyValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "keyValue",
+          "variableType" : "String",
+          "documentation" : "<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "state",
+        "c2jShape" : "DetectorStateDefinition",
+        "deprecated" : false,
+        "documentation" : "<p>The new state, variable values, and timer settings of the detector (instance).</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@param state The new state, variable values, and timer settings of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withState",
+        "getterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@return The new state, variable values, and timer settings of the detector (instance).*/",
+        "getterMethodName" : "getState",
+        "getterModel" : {
+          "returnType" : "DetectorStateDefinition",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "state",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "state",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "State",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@param state The new state, variable values, and timer settings of the detector (instance).*/",
+        "setterMethodName" : "setState",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorStateDefinition",
+          "variableName" : "state",
+          "variableType" : "DetectorStateDefinition",
+          "documentation" : "",
+          "simpleType" : "DetectorStateDefinition",
+          "variableSetterType" : "DetectorStateDefinition"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@param state The new state, variable values, and timer settings of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "DetectorStateDefinition",
+          "variableName" : "state",
+          "variableType" : "DetectorStateDefinition",
+          "documentation" : "<p>The new state, variable values, and timer settings of the detector (instance).</p>",
+          "simpleType" : "DetectorStateDefinition",
+          "variableSetterType" : "DetectorStateDefinition"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "DetectorModelName" : {
+          "c2jName" : "detectorModelName",
+          "c2jShape" : "DetectorModelName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the detector model that created the detectors (instances).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@param detectorModelName The name of the detector model that created the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDetectorModelName",
+          "getterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@return The name of the detector model that created the detectors (instances).*/",
+          "getterMethodName" : "getDetectorModelName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "detectorModelName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "detectorModelName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DetectorModelName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@param detectorModelName The name of the detector model that created the detectors (instances).*/",
+          "setterMethodName" : "setDetectorModelName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the detector model that created the detectors (instances).</p>\n@param detectorModelName The name of the detector model that created the detectors (instances).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "detectorModelName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the detector model that created the detectors (instances).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KeyValue" : {
+          "c2jName" : "keyValue",
+          "c2jShape" : "KeyValue",
+          "deprecated" : false,
+          "documentation" : "<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKeyValue",
+          "getterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@return The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).*/",
+          "getterMethodName" : "getKeyValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "keyValue",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "keyValue",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KeyValue",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).*/",
+          "setterMethodName" : "setKeyValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>\n@param keyValue The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "keyValue",
+            "variableType" : "String",
+            "documentation" : "<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MessageId" : {
+          "c2jName" : "messageId",
+          "c2jShape" : "MessageId",
+          "deprecated" : false,
+          "documentation" : "<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMessageId",
+          "getterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@return The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.*/",
+          "getterMethodName" : "getMessageId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "messageId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "messageId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "MessageId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.*/",
+          "setterMethodName" : "setMessageId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>\n@param messageId The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "messageId",
+            "variableType" : "String",
+            "documentation" : "<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "State" : {
+          "c2jName" : "state",
+          "c2jShape" : "DetectorStateDefinition",
+          "deprecated" : false,
+          "documentation" : "<p>The new state, variable values, and timer settings of the detector (instance).</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@param state The new state, variable values, and timer settings of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withState",
+          "getterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@return The new state, variable values, and timer settings of the detector (instance).*/",
+          "getterMethodName" : "getState",
+          "getterModel" : {
+            "returnType" : "DetectorStateDefinition",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "state",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "state",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "State",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@param state The new state, variable values, and timer settings of the detector (instance).*/",
+          "setterMethodName" : "setState",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorStateDefinition",
+            "variableName" : "state",
+            "variableType" : "DetectorStateDefinition",
+            "documentation" : "",
+            "simpleType" : "DetectorStateDefinition",
+            "variableSetterType" : "DetectorStateDefinition"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new state, variable values, and timer settings of the detector (instance).</p>\n@param state The new state, variable values, and timer settings of the detector (instance).\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "DetectorStateDefinition",
+            "variableName" : "state",
+            "variableType" : "DetectorStateDefinition",
+            "documentation" : "<p>The new state, variable values, and timer settings of the detector (instance).</p>",
+            "simpleType" : "DetectorStateDefinition",
+            "variableSetterType" : "DetectorStateDefinition"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "messageId", "detectorModelName", "state" ],
+      "shapeName" : "UpdateDetectorRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateDetectorRequest",
+        "variableName" : "updateDetectorRequest",
+        "variableType" : "UpdateDetectorRequest",
+        "documentation" : null,
+        "simpleType" : "UpdateDetectorRequest",
+        "variableSetterType" : "UpdateDetectorRequest"
+      },
+      "wrapper" : false
+    },
+    "Variable" : {
+      "c2jName" : "Variable",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The current state of the variable.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "name",
+        "c2jShape" : "VariableName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the variable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**<p>The name of the variable.</p>\n@return The name of the variable.*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the variable.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "value",
+        "c2jShape" : "VariableValue",
+        "deprecated" : false,
+        "documentation" : "<p>The current value of the variable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The current value of the variable.</p>\n@param value The current value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withValue",
+        "getterDocumentation" : "/**<p>The current value of the variable.</p>\n@return The current value of the variable.*/",
+        "getterMethodName" : "getValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "value",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "value",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Value",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The current value of the variable.</p>\n@param value The current value of the variable.*/",
+        "setterMethodName" : "setValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The current value of the variable.</p>\n@param value The current value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "<p>The current value of the variable.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Name" : {
+          "c2jName" : "name",
+          "c2jShape" : "VariableName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the variable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**<p>The name of the variable.</p>\n@return The name of the variable.*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the variable.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Value" : {
+          "c2jName" : "value",
+          "c2jShape" : "VariableValue",
+          "deprecated" : false,
+          "documentation" : "<p>The current value of the variable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The current value of the variable.</p>\n@param value The current value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withValue",
+          "getterDocumentation" : "/**<p>The current value of the variable.</p>\n@return The current value of the variable.*/",
+          "getterMethodName" : "getValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "value",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "value",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Value",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The current value of the variable.</p>\n@param value The current value of the variable.*/",
+          "setterMethodName" : "setValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The current value of the variable.</p>\n@param value The current value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "<p>The current value of the variable.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "name", "value" ],
+      "shapeName" : "Variable",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Variable",
+        "variableName" : "variable",
+        "variableType" : "Variable",
+        "documentation" : null,
+        "simpleType" : "Variable",
+        "variableSetterType" : "Variable"
+      },
+      "wrapper" : false
+    },
+    "VariableDefinition" : {
+      "c2jName" : "VariableDefinition",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The new value of the variable.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "name",
+        "c2jShape" : "VariableName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the variable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**<p>The name of the variable.</p>\n@return The name of the variable.*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the variable.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "value",
+        "c2jShape" : "VariableValue",
+        "deprecated" : false,
+        "documentation" : "<p>The new value of the variable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withValue",
+        "getterDocumentation" : "/**<p>The new value of the variable.</p>\n@return The new value of the variable.*/",
+        "getterMethodName" : "getValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "value",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "value",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Value",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.*/",
+        "setterMethodName" : "setValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "value",
+          "variableType" : "String",
+          "documentation" : "<p>The new value of the variable.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Name" : {
+          "c2jName" : "name",
+          "c2jShape" : "VariableName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the variable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**<p>The name of the variable.</p>\n@return The name of the variable.*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the variable.</p>\n@param name The name of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the variable.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Value" : {
+          "c2jName" : "value",
+          "c2jShape" : "VariableValue",
+          "deprecated" : false,
+          "documentation" : "<p>The new value of the variable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withValue",
+          "getterDocumentation" : "/**<p>The new value of the variable.</p>\n@return The new value of the variable.*/",
+          "getterMethodName" : "getValue",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "value",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "value",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Value",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.*/",
+          "setterMethodName" : "setValue",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The new value of the variable.</p>\n@param value The new value of the variable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "value",
+            "variableType" : "String",
+            "documentation" : "<p>The new value of the variable.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "name", "value" ],
+      "shapeName" : "VariableDefinition",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "VariableDefinition",
+        "variableName" : "variableDefinition",
+        "variableType" : "VariableDefinition",
+        "documentation" : null,
+        "simpleType" : "VariableDefinition",
+        "variableSetterType" : "VariableDefinition"
+      },
+      "wrapper" : false
+    }
+  },
+  "clientConfigFactory" : "ClientConfigurationFactory",
+  "examples" : {
+    "examples" : { },
+    "version" : "1.0"
+  },
+  "exceptionUnmarshallerImpl" : null,
+  "fileHeader" : "/*\n * Copyright 2014-2019 Amazon.com, Inc. or its affiliates. All Rights\n * Reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\").\n * You may not use this file except in compliance with the License.\n * A copy of the License is located at\n *\n *  http://aws.amazon.com/apache2.0\n *\n * or in the \"license\" file accompanying this file. This file is distributed\n * on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either\n * express or implied. See the License for the specific language governing\n * permissions and limitations under the License.\n */",
+  "hasWaiters" : false,
+  "sdkBaseResponseFqcn" : "com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata>",
+  "sdkModeledExceptionBaseClassName" : "AWSIoTEventsDataException",
+  "sdkModeledExceptionBaseFqcn" : "com.amazonaws.services.ioteventsdata.model.AWSIoTEventsDataException",
+  "serviceBaseExceptionFqcn" : "com.amazonaws.AmazonServiceException",
+  "transformPackage" : "com.amazonaws.services.ioteventsdata.model.transform"
+}
\ No newline at end of file
diff --git a/aws-java-sdk-models/src/main/resources/models/iotevents-data-2018-10-23-model.json b/aws-java-sdk-models/src/main/resources/models/iotevents-data-2018-10-23-model.json
new file mode 100644
index 000000000000..4146e9355b80
--- /dev/null
+++ b/aws-java-sdk-models/src/main/resources/models/iotevents-data-2018-10-23-model.json
@@ -0,0 +1,639 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-10-23",
+    "endpointPrefix":"data.iotevents",
+    "protocol":"rest-json",
+    "serviceFullName":"AWS IoT Events Data",
+    "serviceId":"IoT Events Data",
+    "signatureVersion":"v4",
+    "signingName":"ioteventsdata",
+    "uid":"iotevents-data-2018-10-23"
+  },
+  "operations":{
+    "BatchPutMessage":{
+      "name":"BatchPutMessage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/inputs/messages",
+        "responseCode":200
+      },
+      "input":{"shape":"BatchPutMessageRequest"},
+      "output":{"shape":"BatchPutMessageResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Sends a set of messages to the AWS IoT Events system. Each message payload will be transformed into the input you specify (<code>inputName</code>) and ingested into any detectors that monitor that input. If multiple messages are sent, the order in which the messages are processed is not guaranteed--you must send messages one at a time and wait for a successful response to guarantee ordering. </p>"
+    },
+    "BatchUpdateDetector":{
+      "name":"BatchUpdateDetector",
+      "http":{
+        "method":"POST",
+        "requestUri":"/detectors",
+        "responseCode":200
+      },
+      "input":{"shape":"BatchUpdateDetectorRequest"},
+      "output":{"shape":"BatchUpdateDetectorResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"},
+        {"shape":"ThrottlingException"}
+      ],
+      "documentation":"<p>Updates the state, variable values, and timer settings of one or more detectors (instances) of a specified detector model.</p>"
+    },
+    "DescribeDetector":{
+      "name":"DescribeDetector",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detectors/{detectorModelName}/keyValues/"
+      },
+      "input":{"shape":"DescribeDetectorRequest"},
+      "output":{"shape":"DescribeDetectorResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Returns information about the specified detector (instance).</p>"
+    },
+    "ListDetectors":{
+      "name":"ListDetectors",
+      "http":{
+        "method":"GET",
+        "requestUri":"/detectors/{detectorModelName}"
+      },
+      "input":{"shape":"ListDetectorsRequest"},
+      "output":{"shape":"ListDetectorsResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalFailureException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Lists detectors (the instances of a detector model).</p>"
+    }
+  },
+  "shapes":{
+    "BatchPutMessageErrorEntries":{
+      "type":"list",
+      "member":{"shape":"BatchPutMessageErrorEntry"}
+    },
+    "BatchPutMessageErrorEntry":{
+      "type":"structure",
+      "members":{
+        "messageId":{
+          "shape":"MessageId",
+          "documentation":"<p>The ID of the message that caused the error. (See the value corresponding to the <code>messageId</code> key in the <code>message</code> object.)</p>"
+        },
+        "errorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>The code associated with the error.</p>"
+        },
+        "errorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>More information about the error.</p>"
+        }
+      },
+      "documentation":"<p>Contains informations about the errors encountered.</p>"
+    },
+    "BatchPutMessageRequest":{
+      "type":"structure",
+      "required":["messages"],
+      "members":{
+        "messages":{
+          "shape":"Messages",
+          "documentation":"<p>The list of messages to send. Each message has format: <code>'{ \"messageId\": \"string\", \"inputName\": \"string\", \"payload\": \"string\"}'</code>.</p>"
+        }
+      }
+    },
+    "BatchPutMessageResponse":{
+      "type":"structure",
+      "members":{
+        "BatchPutMessageErrorEntries":{
+          "shape":"BatchPutMessageErrorEntries",
+          "documentation":"<p>A list of any errors encountered when sending the messages.</p>"
+        }
+      }
+    },
+    "BatchUpdateDetectorErrorEntries":{
+      "type":"list",
+      "member":{"shape":"BatchUpdateDetectorErrorEntry"}
+    },
+    "BatchUpdateDetectorErrorEntry":{
+      "type":"structure",
+      "members":{
+        "messageId":{
+          "shape":"MessageId",
+          "documentation":"<p>The \"messageId\" of the update request that caused the error. (The value of the <code>messageId</code> in the update request <code>Detector</code> object.)</p>"
+        },
+        "errorCode":{
+          "shape":"ErrorCode",
+          "documentation":"<p>The code of the error.</p>"
+        },
+        "errorMessage":{
+          "shape":"ErrorMessage",
+          "documentation":"<p>A message describing the error.</p>"
+        }
+      },
+      "documentation":"<p>Information about the error which occured when attempting to update a detector.</p>"
+    },
+    "BatchUpdateDetectorRequest":{
+      "type":"structure",
+      "required":["detectors"],
+      "members":{
+        "detectors":{
+          "shape":"UpdateDetectorRequests",
+          "documentation":"<p>The list of detectors (instances) to be updated, along with the values to be updated.</p>"
+        }
+      }
+    },
+    "BatchUpdateDetectorResponse":{
+      "type":"structure",
+      "members":{
+        "batchUpdateDetectorErrorEntries":{
+          "shape":"BatchUpdateDetectorErrorEntries",
+          "documentation":"<p>A list of those detector updates which resulted in errors. (The specific update did not occur if an error is listed here.)</p>"
+        }
+      }
+    },
+    "DescribeDetectorRequest":{
+      "type":"structure",
+      "required":["detectorModelName"],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model whose detectors (instances) you want information about.</p>",
+          "location":"uri",
+          "locationName":"detectorModelName"
+        },
+        "keyValue":{
+          "shape":"KeyValue",
+          "documentation":"<p>A filter used to limit results to detectors (instances) created because of the given key ID.</p>",
+          "location":"querystring",
+          "locationName":"keyValue"
+        }
+      }
+    },
+    "DescribeDetectorResponse":{
+      "type":"structure",
+      "members":{
+        "detector":{
+          "shape":"Detector",
+          "documentation":"<p>Information about the detector (instance).</p>"
+        }
+      }
+    },
+    "Detector":{
+      "type":"structure",
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model that created this detector (instance).</p>"
+        },
+        "keyValue":{
+          "shape":"KeyValue",
+          "documentation":"<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>"
+        },
+        "detectorModelVersion":{
+          "shape":"DetectorModelVersion",
+          "documentation":"<p>The version of the detector model that created this detector (instance).</p>"
+        },
+        "state":{
+          "shape":"DetectorState",
+          "documentation":"<p>The current state of the detector (instance).</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector (instance) was created.</p>"
+        },
+        "lastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector (instance) was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Information about the detector (instance).</p>"
+    },
+    "DetectorModelName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9_-]+$"
+    },
+    "DetectorModelVersion":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "DetectorState":{
+      "type":"structure",
+      "required":[
+        "stateName",
+        "variables",
+        "timers"
+      ],
+      "members":{
+        "stateName":{
+          "shape":"StateName",
+          "documentation":"<p>The name of the state.</p>"
+        },
+        "variables":{
+          "shape":"Variables",
+          "documentation":"<p>The current state of the detector's variables.</p>"
+        },
+        "timers":{
+          "shape":"Timers",
+          "documentation":"<p>The current state of the detector's timers.</p>"
+        }
+      },
+      "documentation":"<p>Information about the current state of the detector instance.</p>"
+    },
+    "DetectorStateDefinition":{
+      "type":"structure",
+      "required":[
+        "stateName",
+        "variables",
+        "timers"
+      ],
+      "members":{
+        "stateName":{
+          "shape":"StateName",
+          "documentation":"<p>The name of the new state of the detector (instance).</p>"
+        },
+        "variables":{
+          "shape":"VariableDefinitions",
+          "documentation":"<p>The new values of the detector's variables. Any variable whose value is not specified will be cleared.</p>"
+        },
+        "timers":{
+          "shape":"TimerDefinitions",
+          "documentation":"<p>The new values of the detector's timers. Any timer whose value is not specified will be cleared and its timeout event will not occur.</p>"
+        }
+      },
+      "documentation":"<p>The new state, variable values and timer settings of the detector (instance).</p>"
+    },
+    "DetectorStateSummary":{
+      "type":"structure",
+      "members":{
+        "stateName":{
+          "shape":"StateName",
+          "documentation":"<p>The name of the state.</p>"
+        }
+      },
+      "documentation":"<p>Information about the detector state.</p>"
+    },
+    "DetectorSummaries":{
+      "type":"list",
+      "member":{"shape":"DetectorSummary"}
+    },
+    "DetectorSummary":{
+      "type":"structure",
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model that created this detector (instance).</p>"
+        },
+        "keyValue":{
+          "shape":"KeyValue",
+          "documentation":"<p>The value of the key (identifying the device or system) that caused the creation of this detector (instance).</p>"
+        },
+        "detectorModelVersion":{
+          "shape":"DetectorModelVersion",
+          "documentation":"<p>The version of the detector model that created this detector (instance).</p>"
+        },
+        "state":{
+          "shape":"DetectorStateSummary",
+          "documentation":"<p>The current state of the detector (instance).</p>"
+        },
+        "creationTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector (instance) was created.</p>"
+        },
+        "lastUpdateTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The time the detector (instance) was last updated.</p>"
+        }
+      },
+      "documentation":"<p>Information about the detector (instance).</p>"
+    },
+    "ErrorCode":{
+      "type":"string",
+      "enum":[
+        "ResourceNotFoundException",
+        "InvalidRequestException",
+        "InternalFailureException",
+        "ServiceUnavailableException",
+        "ThrottlingException"
+      ]
+    },
+    "ErrorMessage":{"type":"string"},
+    "InputName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "InternalFailureException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>An internal failure occured.</p>",
+      "error":{"httpStatusCode":500},
+      "exception":true,
+      "fault":true
+    },
+    "InvalidRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The request was invalid.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "KeyValue":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9\\-_]+$"
+    },
+    "ListDetectorsRequest":{
+      "type":"structure",
+      "required":["detectorModelName"],
+      "members":{
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model whose instances you want to list.</p>",
+          "location":"uri",
+          "locationName":"detectorModelName"
+        },
+        "stateName":{
+          "shape":"StateName",
+          "documentation":"<p>A filter that limits results to those detectors (instances) in the given state.</p>",
+          "location":"querystring",
+          "locationName":"stateName"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        },
+        "maxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of results to return at one time.</p>",
+          "location":"querystring",
+          "locationName":"maxResults"
+        }
+      }
+    },
+    "ListDetectorsResponse":{
+      "type":"structure",
+      "members":{
+        "detectorSummaries":{
+          "shape":"DetectorSummaries",
+          "documentation":"<p>A list of summary information about the detectors (instances).</p>"
+        },
+        "nextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>A token to retrieve the next set of results, or <code>null</code> if there are no additional results.</p>"
+        }
+      }
+    },
+    "MaxResults":{
+      "type":"integer",
+      "max":250,
+      "min":1
+    },
+    "Message":{
+      "type":"structure",
+      "required":[
+        "messageId",
+        "inputName",
+        "payload"
+      ],
+      "members":{
+        "messageId":{
+          "shape":"MessageId",
+          "documentation":"<p>The ID you wish to assign to the message. Each \"messageId\" must be unique within each batch sent.</p>"
+        },
+        "inputName":{
+          "shape":"InputName",
+          "documentation":"<p>The name of the input into which the message payload will be transformed.</p>"
+        },
+        "payload":{
+          "shape":"Payload",
+          "documentation":"<p>The payload of the message. This can be a JSON string or a Base-64-encoded string representing binary data (in which case you must decode it).</p>"
+        }
+      },
+      "documentation":"<p>Information about a message.</p>"
+    },
+    "MessageId":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"^[a-zA-Z0-9_-]+$"
+    },
+    "Messages":{
+      "type":"list",
+      "member":{"shape":"Message"},
+      "min":1
+    },
+    "NextToken":{"type":"string"},
+    "Payload":{"type":"blob"},
+    "ResourceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The resource was not found.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "Seconds":{"type":"integer"},
+    "ServiceUnavailableException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The service is currently unavailable.</p>",
+      "error":{"httpStatusCode":503},
+      "exception":true,
+      "fault":true
+    },
+    "StateName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "message":{
+          "shape":"errorMessage",
+          "documentation":"<p>The message for the exception.</p>"
+        }
+      },
+      "documentation":"<p>The request could not be completed due to throttling.</p>",
+      "error":{"httpStatusCode":429},
+      "exception":true
+    },
+    "Timer":{
+      "type":"structure",
+      "required":[
+        "name",
+        "timestamp"
+      ],
+      "members":{
+        "name":{
+          "shape":"TimerName",
+          "documentation":"<p>The name of the timer.</p>"
+        },
+        "timestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The number of seconds which have elapsed on the timer.</p>"
+        }
+      },
+      "documentation":"<p>The current state of a timer.</p>"
+    },
+    "TimerDefinition":{
+      "type":"structure",
+      "required":[
+        "name",
+        "seconds"
+      ],
+      "members":{
+        "name":{
+          "shape":"TimerName",
+          "documentation":"<p>The name of the timer.</p>"
+        },
+        "seconds":{
+          "shape":"Seconds",
+          "documentation":"<p>The new setting of the timer (the number of seconds before the timer elapses).</p>"
+        }
+      },
+      "documentation":"<p>The new setting of a timer.</p>"
+    },
+    "TimerDefinitions":{
+      "type":"list",
+      "member":{"shape":"TimerDefinition"}
+    },
+    "TimerName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "Timers":{
+      "type":"list",
+      "member":{"shape":"Timer"}
+    },
+    "Timestamp":{"type":"timestamp"},
+    "UpdateDetectorRequest":{
+      "type":"structure",
+      "required":[
+        "messageId",
+        "detectorModelName",
+        "state"
+      ],
+      "members":{
+        "messageId":{
+          "shape":"MessageId",
+          "documentation":"<p>The ID you wish to assign to the detector update \"message\". Each \"messageId\" must be unique within each batch sent.</p>"
+        },
+        "detectorModelName":{
+          "shape":"DetectorModelName",
+          "documentation":"<p>The name of the detector model that created the detectors (instances).</p>"
+        },
+        "keyValue":{
+          "shape":"KeyValue",
+          "documentation":"<p>The value of the input key attribute (identifying the device or system) that caused the creation of this detector (instance).</p>"
+        },
+        "state":{
+          "shape":"DetectorStateDefinition",
+          "documentation":"<p>The new state, variable values, and timer settings of the detector (instance).</p>"
+        }
+      },
+      "documentation":"<p>Information used to update the detector (instance).</p>"
+    },
+    "UpdateDetectorRequests":{
+      "type":"list",
+      "member":{"shape":"UpdateDetectorRequest"},
+      "min":1
+    },
+    "Variable":{
+      "type":"structure",
+      "required":[
+        "name",
+        "value"
+      ],
+      "members":{
+        "name":{
+          "shape":"VariableName",
+          "documentation":"<p>The name of the variable.</p>"
+        },
+        "value":{
+          "shape":"VariableValue",
+          "documentation":"<p>The current value of the variable.</p>"
+        }
+      },
+      "documentation":"<p>The current state of the variable.</p>"
+    },
+    "VariableDefinition":{
+      "type":"structure",
+      "required":[
+        "name",
+        "value"
+      ],
+      "members":{
+        "name":{
+          "shape":"VariableName",
+          "documentation":"<p>The name of the variable.</p>"
+        },
+        "value":{
+          "shape":"VariableValue",
+          "documentation":"<p>The new value of the variable.</p>"
+        }
+      },
+      "documentation":"<p>The new value of the variable.</p>"
+    },
+    "VariableDefinitions":{
+      "type":"list",
+      "member":{"shape":"VariableDefinition"}
+    },
+    "VariableName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[a-zA-Z][a-zA-Z0-9_]*$"
+    },
+    "VariableValue":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
+    "Variables":{
+      "type":"list",
+      "member":{"shape":"Variable"}
+    },
+    "errorMessage":{"type":"string"}
+  },
+  "documentation":"<p>AWS IoT Events monitors your equipment or device fleets for failures or changes in operation, and triggers actions when such events occur.</p>"
+}
diff --git a/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-intermediate.json b/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-intermediate.json
index 2f166b90fc97..dad69cb3599e 100644
--- a/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
@@ -55,7 +55,7 @@
     "defaultEndpoint" : "kafka.us-east-1.amazonaws.com",
     "defaultEndpointWithoutHttpProtocol" : "kafka.us-east-1.amazonaws.com",
     "defaultRegion" : null,
-    "documentation" : "<p>The operations for managing an Amazon MSK cluster.</p>",
+    "documentation" : "\n               <p>The operations for managing an Amazon MSK cluster.</p>\n            ",
     "endpointPrefix" : "kafka",
     "hasApiWithStreamInput" : false,
     "ionProtocol" : false,
@@ -91,37 +91,37 @@
       "asyncReturnType" : "CreateClusterResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Creates a new MSK cluster.</p>",
+      "documentation" : "\n            <p>Creates a new MSK cluster.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       }, {
         "exceptionName" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>",
+        "documentation" : "\n            <p>503 response</p>\n         ",
         "httpStatusCode" : 503
       }, {
         "exceptionName" : "TooManyRequestsException",
-        "documentation" : "<p>429 response</p>",
+        "documentation" : "\n            <p>429 response</p>\n         ",
         "httpStatusCode" : 429
       }, {
         "exceptionName" : "ConflictException",
-        "documentation" : "<p>This cluster name already exists. Retry your request using another name.</p>",
+        "documentation" : "\n            <p>This cluster name already exists. Retry your request using another name.</p>\n         ",
         "httpStatusCode" : 409
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -151,37 +151,37 @@
       "asyncReturnType" : "CreateConfigurationResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Creates a new MSK configuration.</p>",
+      "documentation" : "\n            <p>Creates a new MSK configuration.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       }, {
         "exceptionName" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>",
+        "documentation" : "\n            <p>503 response</p>\n         ",
         "httpStatusCode" : 503
       }, {
         "exceptionName" : "TooManyRequestsException",
-        "documentation" : "<p>429 response</p>",
+        "documentation" : "\n            <p>429 response</p>\n         ",
         "httpStatusCode" : 429
       }, {
         "exceptionName" : "ConflictException",
-        "documentation" : "<p>This configuration name already exists. Retry your request using another name.</p>",
+        "documentation" : "\n            <p>This cluster name already exists. Retry your request using another name.</p>\n         ",
         "httpStatusCode" : 409
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -200,7 +200,7 @@
       "operationName" : "CreateConfiguration",
       "returnType" : {
         "returnType" : "CreateConfigurationResult",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "syncReturnType" : "CreateConfigurationResult"
     },
@@ -211,25 +211,25 @@
       "asyncReturnType" : "DeleteClusterResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Deletes the MSK cluster specified by the Amazon Resource Name (ARN) in the request.</p>",
+      "documentation" : "\n            <p>Deletes the MSK cluster specified by the Amazon Resource Name (ARN) in the request.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -248,7 +248,7 @@
       "operationName" : "DeleteCluster",
       "returnType" : {
         "returnType" : "DeleteClusterResult",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "syncReturnType" : "DeleteClusterResult"
     },
@@ -259,29 +259,29 @@
       "asyncReturnType" : "DescribeClusterResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a description of the MSK cluster whose Amazon Resource Name (ARN) is specified in the request.</p>",
+      "documentation" : "\n            <p>Returns a description of the MSK cluster whose Amazon Resource Name (ARN) is specified in the request.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -300,10 +300,62 @@
       "operationName" : "DescribeCluster",
       "returnType" : {
         "returnType" : "DescribeClusterResult",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "syncReturnType" : "DescribeClusterResult"
     },
+    "DescribeClusterOperation" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<DescribeClusterOperationResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<DescribeClusterOperationResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<DescribeClusterOperationRequest, DescribeClusterOperationResult>",
+      "asyncReturnType" : "DescribeClusterOperationResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns a description of the cluster operation specified by the ARN.</p>\n         ",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "NotFoundException",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
+        "httpStatusCode" : 401
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
+        "httpStatusCode" : 403
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeClusterOperationRequest",
+        "variableName" : "describeClusterOperationRequest",
+        "variableType" : "DescribeClusterOperationRequest",
+        "documentation" : "",
+        "simpleType" : "DescribeClusterOperationRequest",
+        "variableSetterType" : "DescribeClusterOperationRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "describeClusterOperation",
+      "operationName" : "DescribeClusterOperation",
+      "returnType" : {
+        "returnType" : "DescribeClusterOperationResult",
+        "documentation" : "\n            <p>200 response</p>\n         "
+      },
+      "syncReturnType" : "DescribeClusterOperationResult"
+    },
     "DescribeConfiguration" : {
       "asyncCallableType" : "java.util.concurrent.Callable<DescribeConfigurationResult>",
       "asyncFutureType" : "java.util.concurrent.Future<DescribeConfigurationResult>",
@@ -311,33 +363,33 @@
       "asyncReturnType" : "DescribeConfigurationResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a description of this MSK configuration.</p>",
+      "documentation" : "\n            <p>Returns a description of this MSK configuration.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       }, {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>",
+        "documentation" : "\n            <p>503 response</p>\n         ",
         "httpStatusCode" : 503
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -356,7 +408,7 @@
       "operationName" : "DescribeConfiguration",
       "returnType" : {
         "returnType" : "DescribeConfigurationResult",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "syncReturnType" : "DescribeConfigurationResult"
     },
@@ -367,33 +419,33 @@
       "asyncReturnType" : "DescribeConfigurationRevisionResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a description of this revision of the configuration.</p>",
+      "documentation" : "\n            <p>Returns a description of this revision of the configuration.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       }, {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>",
+        "documentation" : "\n            <p>503 response</p>\n         ",
         "httpStatusCode" : 503
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -412,7 +464,7 @@
       "operationName" : "DescribeConfigurationRevision",
       "returnType" : {
         "returnType" : "DescribeConfigurationRevisionResult",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "syncReturnType" : "DescribeConfigurationRevisionResult"
     },
@@ -423,29 +475,29 @@
       "asyncReturnType" : "GetBootstrapBrokersResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>A list of brokers that a client application can use to bootstrap.</p>",
+      "documentation" : "\n            <p>A list of brokers that a client application can use to bootstrap.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ConflictException",
-        "documentation" : "<p>This cluster name already exists. Retry your request using another name.</p>",
+        "documentation" : "\n            <p>This cluster name already exists. Retry your request using another name.</p>\n         ",
         "httpStatusCode" : 409
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -464,10 +516,58 @@
       "operationName" : "GetBootstrapBrokers",
       "returnType" : {
         "returnType" : "GetBootstrapBrokersResult",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "syncReturnType" : "GetBootstrapBrokersResult"
     },
+    "ListClusterOperations" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListClusterOperationsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListClusterOperationsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListClusterOperationsRequest, ListClusterOperationsResult>",
+      "asyncReturnType" : "ListClusterOperationsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns a list of all the operations that have been performed on the specified MSK cluster.</p>\n         ",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
+        "httpStatusCode" : 401
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
+        "httpStatusCode" : 403
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListClusterOperationsRequest",
+        "variableName" : "listClusterOperationsRequest",
+        "variableType" : "ListClusterOperationsRequest",
+        "documentation" : "",
+        "simpleType" : "ListClusterOperationsRequest",
+        "variableSetterType" : "ListClusterOperationsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listClusterOperations",
+      "operationName" : "ListClusterOperations",
+      "returnType" : {
+        "returnType" : "ListClusterOperationsResult",
+        "documentation" : "\n            <p>Successful response.</p>\n         "
+      },
+      "syncReturnType" : "ListClusterOperationsResult"
+    },
     "ListClusters" : {
       "asyncCallableType" : "java.util.concurrent.Callable<ListClustersResult>",
       "asyncFutureType" : "java.util.concurrent.Future<ListClustersResult>",
@@ -475,25 +575,25 @@
       "asyncReturnType" : "ListClustersResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a list of clusters in an account.</p>",
+      "documentation" : "\n            <p>Returns a list of all the MSK clusters in the current Region.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -512,10 +612,66 @@
       "operationName" : "ListClusters",
       "returnType" : {
         "returnType" : "ListClustersResult",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "syncReturnType" : "ListClustersResult"
     },
+    "ListConfigurationRevisions" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListConfigurationRevisionsResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListConfigurationRevisionsResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListConfigurationRevisionsRequest, ListConfigurationRevisionsResult>",
+      "asyncReturnType" : "ListConfigurationRevisionsResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns a list of all the MSK configurations in this Region.</p>\n         ",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
+        "httpStatusCode" : 401
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "NotFoundException",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>503 response</p>\n         ",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListConfigurationRevisionsRequest",
+        "variableName" : "listConfigurationRevisionsRequest",
+        "variableType" : "ListConfigurationRevisionsRequest",
+        "documentation" : "",
+        "simpleType" : "ListConfigurationRevisionsRequest",
+        "variableSetterType" : "ListConfigurationRevisionsRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listConfigurationRevisions",
+      "operationName" : "ListConfigurationRevisions",
+      "returnType" : {
+        "returnType" : "ListConfigurationRevisionsResult",
+        "documentation" : "\n            <p>200 response</p>\n         "
+      },
+      "syncReturnType" : "ListConfigurationRevisionsResult"
+    },
     "ListConfigurations" : {
       "asyncCallableType" : "java.util.concurrent.Callable<ListConfigurationsResult>",
       "asyncFutureType" : "java.util.concurrent.Future<ListConfigurationsResult>",
@@ -523,29 +679,29 @@
       "asyncReturnType" : "ListConfigurationsResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a list of all the MSK configurations in this Region for this account.</p>",
+      "documentation" : "\n            <p>Returns a list of all the MSK configurations in this Region.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>",
+        "documentation" : "\n            <p>503 response</p>\n         ",
         "httpStatusCode" : 503
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
         "httpStatusCode" : 401
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -564,7 +720,7 @@
       "operationName" : "ListConfigurations",
       "returnType" : {
         "returnType" : "ListConfigurationsResult",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "syncReturnType" : "ListConfigurationsResult"
     },
@@ -575,25 +731,25 @@
       "asyncReturnType" : "ListNodesResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a list of the broker nodes in the cluster.</p>",
+      "documentation" : "\n            <p>Returns a list of the broker nodes in the cluster.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
         "httpStatusCode" : 403
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -612,7 +768,7 @@
       "operationName" : "ListNodes",
       "returnType" : {
         "returnType" : "ListNodesResult",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "syncReturnType" : "ListNodesResult"
     },
@@ -623,21 +779,21 @@
       "asyncReturnType" : "ListTagsForResourceResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Returns a list of tags attached to a resource.</p>",
+      "documentation" : "\n            <p>Returns a list of the tags associated with the specified resource.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -656,7 +812,7 @@
       "operationName" : "ListTagsForResource",
       "returnType" : {
         "returnType" : "ListTagsForResourceResult",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Success response.</p>\n         "
       },
       "syncReturnType" : "ListTagsForResourceResult"
     },
@@ -667,21 +823,21 @@
       "asyncReturnType" : "TagResourceResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Tag a resource with given tags.</p>",
+      "documentation" : "\n            <p>Adds tags to the specified MSK resource.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -711,21 +867,21 @@
       "asyncReturnType" : "UntagResourceResult",
       "authenticated" : true,
       "deprecated" : false,
-      "documentation" : "<p>Remove tags of a resource by given tag keys.</p>",
+      "documentation" : "\n            <p>Removes the tags associated with the keys that are provided in the query.</p>\n         ",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
         "httpStatusCode" : 404
       }, {
         "exceptionName" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
         "httpStatusCode" : 500
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -747,6 +903,114 @@
         "documentation" : null
       },
       "syncReturnType" : "UntagResourceResult"
+    },
+    "UpdateBrokerStorage" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<UpdateBrokerStorageResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<UpdateBrokerStorageResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<UpdateBrokerStorageRequest, UpdateBrokerStorageResult>",
+      "asyncReturnType" : "UpdateBrokerStorageResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "\n            <p>Updates the EBS storage associated with MSK brokers.</p>\n         ",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>503 response</p>\n         ",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
+        "httpStatusCode" : 401
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
+        "httpStatusCode" : 403
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateBrokerStorageRequest",
+        "variableName" : "updateBrokerStorageRequest",
+        "variableType" : "UpdateBrokerStorageRequest",
+        "documentation" : "",
+        "simpleType" : "UpdateBrokerStorageRequest",
+        "variableSetterType" : "UpdateBrokerStorageRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "updateBrokerStorage",
+      "operationName" : "UpdateBrokerStorage",
+      "returnType" : {
+        "returnType" : "UpdateBrokerStorageResult",
+        "documentation" : "\n            <p>Successful response.</p>\n         "
+      },
+      "syncReturnType" : "UpdateBrokerStorageResult"
+    },
+    "UpdateClusterConfiguration" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<UpdateClusterConfigurationResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<UpdateClusterConfigurationResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<UpdateClusterConfigurationRequest, UpdateClusterConfigurationResult>",
+      "asyncReturnType" : "UpdateClusterConfigurationResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "\n            <p>Updates the cluster with the configuration that is specified in the request body.</p>\n         ",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         ",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         ",
+        "httpStatusCode" : 401
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         ",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         ",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "NotFoundException",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         ",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>503 response</p>\n         ",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UpdateClusterConfigurationRequest",
+        "variableName" : "updateClusterConfigurationRequest",
+        "variableType" : "UpdateClusterConfigurationRequest",
+        "documentation" : "",
+        "simpleType" : "UpdateClusterConfigurationRequest",
+        "variableSetterType" : "UpdateClusterConfigurationRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "updateClusterConfiguration",
+      "operationName" : "UpdateClusterConfiguration",
+      "returnType" : {
+        "returnType" : "UpdateClusterConfigurationResult",
+        "documentation" : "\n            <p>Successful response.</p>\n         "
+      },
+      "syncReturnType" : "UpdateClusterConfigurationResult"
     }
   },
   "shapes" : {
@@ -759,7 +1023,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "enums" : null,
       "errorCode" : "BadRequestException",
       "hasHeaderMember" : false,
@@ -772,11 +1036,11 @@
         "c2jName" : "InvalidParameter",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
         "getterMethodName" : "getInvalidParameter",
         "getterModel" : {
           "returnType" : "String",
@@ -810,7 +1074,7 @@
         "marshallingType" : "STRING",
         "name" : "InvalidParameter",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
         "setterMethodName" : "setInvalidParameter",
         "setterModel" : {
           "timestampFormat" : null,
@@ -824,13 +1088,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "invalidParameter",
           "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -841,11 +1105,11 @@
           "c2jName" : "InvalidParameter",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
           "getterMethodName" : "getInvalidParameter",
           "getterModel" : {
             "returnType" : "String",
@@ -879,7 +1143,7 @@
           "marshallingType" : "STRING",
           "name" : "InvalidParameter",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
           "setterMethodName" : "setInvalidParameter",
           "setterModel" : {
             "timestampFormat" : null,
@@ -893,13 +1157,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "invalidParameter",
             "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -933,7 +1197,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>The distribution of broker nodes across Availability Zones. By default, broker nodes are distributed among three Availability Zones. Currently, the only supported value is DEFAULT. You can either specify this value explicitly or leave it out.</p>",
+      "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones. By default, broker nodes are distributed among three Availability Zones. Currently, the only supported value is DEFAULT. You can either specify this value explicitly or leave it out.</p>\n         ",
       "enums" : [ {
         "name" : "DEFAULT",
         "value" : "DEFAULT"
@@ -968,8 +1232,8 @@
       },
       "wrapper" : false
     },
-    "BrokerNodeGroupInfo" : {
-      "c2jName" : "BrokerNodeGroupInfo",
+    "BrokerEBSVolumeInfo" : {
+      "c2jName" : "BrokerEBSVolumeInfo",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -977,7 +1241,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Describes the setup to be used for Kafka broker nodes in the cluster.</p>",
+      "documentation" : "\n            <p>Specifies the EBS volume upgrade information. The broker identifier must be set to the keyword ALL. This means the changes apply to all the brokers in the cluster.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -987,15 +1251,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "BrokerAZDistribution",
-        "c2jShape" : "BrokerAZDistribution",
+        "c2jName" : "KafkaBrokerNodeId",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The distribution of broker nodes across Availability Zones.</p>",
-        "enumType" : "BrokerAZDistribution",
-        "fluentSetterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@param brokerAZDistribution The distribution of broker nodes across Availability Zones.\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
-        "fluentSetterMethodName" : "withBrokerAZDistribution",
-        "getterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@return The distribution of broker nodes across Availability Zones.\n@see BrokerAZDistribution*/",
-        "getterMethodName" : "getBrokerAZDistribution",
+        "documentation" : "\n            <p>The ID of the broker to update.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@param kafkaBrokerNodeId <p>The ID of the broker to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKafkaBrokerNodeId",
+        "getterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@return <p>The ID of the broker to update.</p>*/",
+        "getterMethodName" : "getKafkaBrokerNodeId",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -1010,11 +1274,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "brokerAZDistribution",
+          "marshallLocationName" : "kafkaBrokerNodeId",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "brokerAZDistribution",
+          "unmarshallLocationName" : "kafkaBrokerNodeId",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -1026,14 +1290,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "BrokerAZDistribution",
+        "name" : "KafkaBrokerNodeId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@param brokerAZDistribution The distribution of broker nodes across Availability Zones.\n@see BrokerAZDistribution*/",
-        "setterMethodName" : "setBrokerAZDistribution",
+        "setterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@param kafkaBrokerNodeId <p>The ID of the broker to update.</p>*/",
+        "setterMethodName" : "setKafkaBrokerNodeId",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "brokerAZDistribution",
+          "variableName" : "kafkaBrokerNodeId",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -1042,29 +1306,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@param brokerAZDistribution The distribution of broker nodes across Availability Zones.\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
+        "varargSetterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@param kafkaBrokerNodeId <p>The ID of the broker to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "brokerAZDistribution",
+          "variableName" : "kafkaBrokerNodeId",
           "variableType" : "String",
-          "documentation" : "<p>The distribution of broker nodes across Availability Zones.</p>",
+          "documentation" : "\n            <p>The ID of the broker to update.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "ClientSubnets",
-        "c2jShape" : "__listOf__string",
+        "c2jName" : "VolumeSizeGB",
+        "c2jShape" : "__integer",
         "deprecated" : false,
-        "documentation" : "<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>",
+        "documentation" : "\n            <p>Size of the EBS volume to update.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@param clientSubnets The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClientSubnets",
-        "getterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@return The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.*/",
-        "getterMethodName" : "getClientSubnets",
+        "fluentSetterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@param volumeSizeGB <p>Size of the EBS volume to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withVolumeSizeGB",
+        "getterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@return <p>Size of the EBS volume to update.</p>*/",
+        "getterMethodName" : "getVolumeSizeGB",
         "getterModel" : {
-          "returnType" : "java.util.List<String>",
+          "returnType" : "Integer",
           "documentation" : null
         },
         "http" : {
@@ -1077,27 +1341,339 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clientSubnets",
+          "marshallLocationName" : "volumeSizeGB",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clientSubnets",
+          "unmarshallLocationName" : "volumeSizeGB",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "__string",
-            "deprecated" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "VolumeSizeGB",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@param volumeSizeGB <p>Size of the EBS volume to update.</p>*/",
+        "setterMethodName" : "setVolumeSizeGB",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "volumeSizeGB",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@param volumeSizeGB <p>Size of the EBS volume to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "volumeSizeGB",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>Size of the EBS volume to update.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "KafkaBrokerNodeId" : {
+          "c2jName" : "KafkaBrokerNodeId",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The ID of the broker to update.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@param kafkaBrokerNodeId <p>The ID of the broker to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKafkaBrokerNodeId",
+          "getterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@return <p>The ID of the broker to update.</p>*/",
+          "getterMethodName" : "getKafkaBrokerNodeId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "kafkaBrokerNodeId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "kafkaBrokerNodeId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KafkaBrokerNodeId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@param kafkaBrokerNodeId <p>The ID of the broker to update.</p>*/",
+          "setterMethodName" : "setKafkaBrokerNodeId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kafkaBrokerNodeId",
+            "variableType" : "String",
             "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The ID of the broker to update.</p>\n         \n@param kafkaBrokerNodeId <p>The ID of the broker to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kafkaBrokerNodeId",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The ID of the broker to update.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "VolumeSizeGB" : {
+          "c2jName" : "VolumeSizeGB",
+          "c2jShape" : "__integer",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Size of the EBS volume to update.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@param volumeSizeGB <p>Size of the EBS volume to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withVolumeSizeGB",
+          "getterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@return <p>Size of the EBS volume to update.</p>*/",
+          "getterMethodName" : "getVolumeSizeGB",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "volumeSizeGB",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "volumeSizeGB",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "VolumeSizeGB",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@param volumeSizeGB <p>Size of the EBS volume to update.</p>*/",
+          "setterMethodName" : "setVolumeSizeGB",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "volumeSizeGB",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Size of the EBS volume to update.</p>\n         \n@param volumeSizeGB <p>Size of the EBS volume to update.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "volumeSizeGB",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>Size of the EBS volume to update.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "VolumeSizeGB", "KafkaBrokerNodeId" ],
+      "shapeName" : "BrokerEBSVolumeInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BrokerEBSVolumeInfo",
+        "variableName" : "brokerEBSVolumeInfo",
+        "variableType" : "BrokerEBSVolumeInfo",
+        "documentation" : null,
+        "simpleType" : "BrokerEBSVolumeInfo",
+        "variableSetterType" : "BrokerEBSVolumeInfo"
+      },
+      "wrapper" : false
+    },
+    "BrokerNodeGroupInfo" : {
+      "c2jName" : "BrokerNodeGroupInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Describes the setup to be used for Kafka broker nodes in the cluster.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "BrokerAZDistribution",
+        "c2jShape" : "BrokerAZDistribution",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         ",
+        "enumType" : "BrokerAZDistribution",
+        "fluentSetterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@param brokerAZDistribution <p>The distribution of broker nodes across Availability Zones.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
+        "fluentSetterMethodName" : "withBrokerAZDistribution",
+        "getterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@return <p>The distribution of broker nodes across Availability Zones.</p>\n@see BrokerAZDistribution*/",
+        "getterMethodName" : "getBrokerAZDistribution",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "brokerAZDistribution",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "brokerAZDistribution",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "BrokerAZDistribution",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@param brokerAZDistribution <p>The distribution of broker nodes across Availability Zones.</p>\n@see BrokerAZDistribution*/",
+        "setterMethodName" : "setBrokerAZDistribution",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "brokerAZDistribution",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@param brokerAZDistribution <p>The distribution of broker nodes across Availability Zones.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "brokerAZDistribution",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ClientSubnets",
+        "c2jShape" : "__listOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n@param clientSubnets <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClientSubnets",
+        "getterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n@return <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>*/",
+        "getterMethodName" : "getClientSubnets",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clientSubnets",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clientSubnets",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "fluentSetterMethodName" : "withMember",
             "getterDocumentation" : "/**\n@return */",
             "getterMethodName" : "getMember",
@@ -1177,7 +1753,7 @@
         "marshallingType" : "LIST",
         "name" : "ClientSubnets",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@param clientSubnets The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.*/",
+        "setterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n@param clientSubnets <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>*/",
         "setterMethodName" : "setClientSubnets",
         "setterModel" : {
           "timestampFormat" : null,
@@ -1191,13 +1767,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClientSubnets(java.util.Collection)} or {@link #withClientSubnets(java.util.Collection)} if you want to override the existing values.</p>\n@param clientSubnets The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClientSubnets(java.util.Collection)} or {@link #withClientSubnets(java.util.Collection)} if you want to override the existing values.</p>\n@param clientSubnets <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "java.util.List<String>",
           "variableName" : "clientSubnets",
           "variableType" : "java.util.List<String>",
-          "documentation" : "<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>",
+          "documentation" : "\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         ",
           "simpleType" : "List<String>",
           "variableSetterType" : "java.util.Collection<String>"
         },
@@ -1206,11 +1782,11 @@
         "c2jName" : "InstanceType",
         "c2jShape" : "__stringMin5Max32",
         "deprecated" : false,
-        "documentation" : "<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>",
+        "documentation" : "\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@param instanceType The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@param instanceType <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withInstanceType",
-        "getterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@return The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.*/",
+        "getterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@return <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>*/",
         "getterMethodName" : "getInstanceType",
         "getterModel" : {
           "returnType" : "String",
@@ -1244,7 +1820,7 @@
         "marshallingType" : "STRING",
         "name" : "InstanceType",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@param instanceType The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.*/",
+        "setterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@param instanceType <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>*/",
         "setterMethodName" : "setInstanceType",
         "setterModel" : {
           "timestampFormat" : null,
@@ -1258,13 +1834,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@param instanceType The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@param instanceType <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "instanceType",
           "variableType" : "String",
-          "documentation" : "<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>",
+          "documentation" : "\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -1273,11 +1849,11 @@
         "c2jName" : "SecurityGroups",
         "c2jShape" : "__listOf__string",
         "deprecated" : false,
-        "documentation" : "<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>",
+        "documentation" : "\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n@param securityGroups The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n@param securityGroups <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withSecurityGroups",
-        "getterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n@return The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.*/",
+        "getterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n@return <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>*/",
         "getterMethodName" : "getSecurityGroups",
         "getterModel" : {
           "returnType" : "java.util.List<String>",
@@ -1393,7 +1969,7 @@
         "marshallingType" : "LIST",
         "name" : "SecurityGroups",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n@param securityGroups The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.*/",
+        "setterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n@param securityGroups <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>*/",
         "setterMethodName" : "setSecurityGroups",
         "setterModel" : {
           "timestampFormat" : null,
@@ -1407,13 +1983,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSecurityGroups(java.util.Collection)} or {@link #withSecurityGroups(java.util.Collection)} if you want to override the existing values.</p>\n@param securityGroups The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSecurityGroups(java.util.Collection)} or {@link #withSecurityGroups(java.util.Collection)} if you want to override the existing values.</p>\n@param securityGroups <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "java.util.List<String>",
           "variableName" : "securityGroups",
           "variableType" : "java.util.List<String>",
-          "documentation" : "<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>",
+          "documentation" : "\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         ",
           "simpleType" : "List<String>",
           "variableSetterType" : "java.util.Collection<String>"
         },
@@ -1422,11 +1998,11 @@
         "c2jName" : "StorageInfo",
         "c2jShape" : "StorageInfo",
         "deprecated" : false,
-        "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>",
+        "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@param storageInfo Contains information about storage volumes attached to MSK broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@param storageInfo <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withStorageInfo",
-        "getterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@return Contains information about storage volumes attached to MSK broker nodes.*/",
+        "getterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@return <p>Contains information about storage volumes attached to MSK broker nodes.</p>*/",
         "getterMethodName" : "getStorageInfo",
         "getterModel" : {
           "returnType" : "StorageInfo",
@@ -1460,7 +2036,7 @@
         "marshallingType" : "STRUCTURED",
         "name" : "StorageInfo",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@param storageInfo Contains information about storage volumes attached to MSK broker nodes.*/",
+        "setterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@param storageInfo <p>Contains information about storage volumes attached to MSK broker nodes.</p>*/",
         "setterMethodName" : "setStorageInfo",
         "setterModel" : {
           "timestampFormat" : null,
@@ -1474,13 +2050,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@param storageInfo Contains information about storage volumes attached to MSK broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@param storageInfo <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "StorageInfo",
           "variableName" : "storageInfo",
           "variableType" : "StorageInfo",
-          "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>",
+          "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         ",
           "simpleType" : "StorageInfo",
           "variableSetterType" : "StorageInfo"
         },
@@ -1491,11 +2067,11 @@
           "c2jName" : "BrokerAZDistribution",
           "c2jShape" : "BrokerAZDistribution",
           "deprecated" : false,
-          "documentation" : "<p>The distribution of broker nodes across Availability Zones.</p>",
+          "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         ",
           "enumType" : "BrokerAZDistribution",
-          "fluentSetterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@param brokerAZDistribution The distribution of broker nodes across Availability Zones.\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@param brokerAZDistribution <p>The distribution of broker nodes across Availability Zones.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
           "fluentSetterMethodName" : "withBrokerAZDistribution",
-          "getterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@return The distribution of broker nodes across Availability Zones.\n@see BrokerAZDistribution*/",
+          "getterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@return <p>The distribution of broker nodes across Availability Zones.</p>\n@see BrokerAZDistribution*/",
           "getterMethodName" : "getBrokerAZDistribution",
           "getterModel" : {
             "returnType" : "String",
@@ -1529,7 +2105,7 @@
           "marshallingType" : "STRING",
           "name" : "BrokerAZDistribution",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@param brokerAZDistribution The distribution of broker nodes across Availability Zones.\n@see BrokerAZDistribution*/",
+          "setterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@param brokerAZDistribution <p>The distribution of broker nodes across Availability Zones.</p>\n@see BrokerAZDistribution*/",
           "setterMethodName" : "setBrokerAZDistribution",
           "setterModel" : {
             "timestampFormat" : null,
@@ -1543,13 +2119,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The distribution of broker nodes across Availability Zones.</p>\n@param brokerAZDistribution The distribution of broker nodes across Availability Zones.\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
+          "varargSetterDocumentation" : "/**\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         \n@param brokerAZDistribution <p>The distribution of broker nodes across Availability Zones.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see BrokerAZDistribution*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "brokerAZDistribution",
             "variableType" : "String",
-            "documentation" : "<p>The distribution of broker nodes across Availability Zones.</p>",
+            "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -1559,11 +2135,11 @@
           "c2jName" : "ClientSubnets",
           "c2jShape" : "__listOf__string",
           "deprecated" : false,
-          "documentation" : "<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>",
+          "documentation" : "\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@param clientSubnets The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n@param clientSubnets <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClientSubnets",
-          "getterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@return The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.*/",
+          "getterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n@return <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>*/",
           "getterMethodName" : "getClientSubnets",
           "getterModel" : {
             "returnType" : "java.util.List<String>",
@@ -1679,7 +2255,7 @@
           "marshallingType" : "LIST",
           "name" : "ClientSubnets",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@param clientSubnets The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.*/",
+          "setterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n@param clientSubnets <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>*/",
           "setterMethodName" : "setClientSubnets",
           "setterModel" : {
             "timestampFormat" : null,
@@ -1693,13 +2269,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClientSubnets(java.util.Collection)} or {@link #withClientSubnets(java.util.Collection)} if you want to override the existing values.</p>\n@param clientSubnets The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClientSubnets(java.util.Collection)} or {@link #withClientSubnets(java.util.Collection)} if you want to override the existing values.</p>\n@param clientSubnets <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "java.util.List<String>",
             "variableName" : "clientSubnets",
             "variableType" : "java.util.List<String>",
-            "documentation" : "<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>",
+            "documentation" : "\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         ",
             "simpleType" : "List<String>",
             "variableSetterType" : "java.util.Collection<String>"
           },
@@ -1709,11 +2285,11 @@
           "c2jName" : "InstanceType",
           "c2jShape" : "__stringMin5Max32",
           "deprecated" : false,
-          "documentation" : "<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>",
+          "documentation" : "\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@param instanceType The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@param instanceType <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withInstanceType",
-          "getterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@return The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.*/",
+          "getterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@return <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>*/",
           "getterMethodName" : "getInstanceType",
           "getterModel" : {
             "returnType" : "String",
@@ -1747,7 +2323,7 @@
           "marshallingType" : "STRING",
           "name" : "InstanceType",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@param instanceType The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.*/",
+          "setterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@param instanceType <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>*/",
           "setterMethodName" : "setInstanceType",
           "setterModel" : {
             "timestampFormat" : null,
@@ -1761,13 +2337,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@param instanceType The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         \n@param instanceType <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "instanceType",
             "variableType" : "String",
-            "documentation" : "<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>",
+            "documentation" : "\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -1777,11 +2353,11 @@
           "c2jName" : "SecurityGroups",
           "c2jShape" : "__listOf__string",
           "deprecated" : false,
-          "documentation" : "<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>",
+          "documentation" : "\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n@param securityGroups The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n@param securityGroups <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withSecurityGroups",
-          "getterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n@return The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n@return <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>*/",
           "getterMethodName" : "getSecurityGroups",
           "getterModel" : {
             "returnType" : "java.util.List<String>",
@@ -1897,7 +2473,7 @@
           "marshallingType" : "LIST",
           "name" : "SecurityGroups",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n@param securityGroups The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n@param securityGroups <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>*/",
           "setterMethodName" : "setSecurityGroups",
           "setterModel" : {
             "timestampFormat" : null,
@@ -1911,13 +2487,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSecurityGroups(java.util.Collection)} or {@link #withSecurityGroups(java.util.Collection)} if you want to override the existing values.</p>\n@param securityGroups The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSecurityGroups(java.util.Collection)} or {@link #withSecurityGroups(java.util.Collection)} if you want to override the existing values.</p>\n@param securityGroups <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "java.util.List<String>",
             "variableName" : "securityGroups",
             "variableType" : "java.util.List<String>",
-            "documentation" : "<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>",
+            "documentation" : "\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         ",
             "simpleType" : "List<String>",
             "variableSetterType" : "java.util.Collection<String>"
           },
@@ -1927,11 +2503,11 @@
           "c2jName" : "StorageInfo",
           "c2jShape" : "StorageInfo",
           "deprecated" : false,
-          "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>",
+          "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@param storageInfo Contains information about storage volumes attached to MSK broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@param storageInfo <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withStorageInfo",
-          "getterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@return Contains information about storage volumes attached to MSK broker nodes.*/",
+          "getterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@return <p>Contains information about storage volumes attached to MSK broker nodes.</p>*/",
           "getterMethodName" : "getStorageInfo",
           "getterModel" : {
             "returnType" : "StorageInfo",
@@ -1965,7 +2541,7 @@
           "marshallingType" : "STRUCTURED",
           "name" : "StorageInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@param storageInfo Contains information about storage volumes attached to MSK broker nodes.*/",
+          "setterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@param storageInfo <p>Contains information about storage volumes attached to MSK broker nodes.</p>*/",
           "setterMethodName" : "setStorageInfo",
           "setterModel" : {
             "timestampFormat" : null,
@@ -1979,13 +2555,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@param storageInfo Contains information about storage volumes attached to MSK broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         \n@param storageInfo <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "StorageInfo",
             "variableName" : "storageInfo",
             "variableType" : "StorageInfo",
-            "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>",
+            "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         ",
             "simpleType" : "StorageInfo",
             "variableSetterType" : "StorageInfo"
           },
@@ -2022,7 +2598,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>BrokerNodeInfo</p>",
+      "documentation" : "\n            <p>BrokerNodeInfo</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -2035,11 +2611,11 @@
         "c2jName" : "AttachedENIId",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+        "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withAttachedENIId",
-        "getterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@return The attached elastic network interface of the broker.*/",
+        "getterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@return <p>The attached elastic network interface of the broker.</p>*/",
         "getterMethodName" : "getAttachedENIId",
         "getterModel" : {
           "returnType" : "String",
@@ -2073,7 +2649,7 @@
         "marshallingType" : "STRING",
         "name" : "AttachedENIId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.*/",
+        "setterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>*/",
         "setterMethodName" : "setAttachedENIId",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2087,13 +2663,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "attachedENIId",
           "variableType" : "String",
-          "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+          "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -2102,11 +2678,11 @@
         "c2jName" : "BrokerId",
         "c2jShape" : "__double",
         "deprecated" : false,
-        "documentation" : "<p>The ID of the broker.</p>",
+        "documentation" : "\n            <p>The ID of the broker.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The ID of the broker.</p>\n@param brokerId The ID of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@param brokerId <p>The ID of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withBrokerId",
-        "getterDocumentation" : "/**<p>The ID of the broker.</p>\n@return The ID of the broker.*/",
+        "getterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@return <p>The ID of the broker.</p>*/",
         "getterMethodName" : "getBrokerId",
         "getterModel" : {
           "returnType" : "Double",
@@ -2140,7 +2716,7 @@
         "marshallingType" : "DOUBLE",
         "name" : "BrokerId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The ID of the broker.</p>\n@param brokerId The ID of the broker.*/",
+        "setterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@param brokerId <p>The ID of the broker.</p>*/",
         "setterMethodName" : "setBrokerId",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2154,13 +2730,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The ID of the broker.</p>\n@param brokerId The ID of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@param brokerId <p>The ID of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Double",
           "variableName" : "brokerId",
           "variableType" : "Double",
-          "documentation" : "<p>The ID of the broker.</p>",
+          "documentation" : "\n            <p>The ID of the broker.</p>\n         ",
           "simpleType" : "Double",
           "variableSetterType" : "Double"
         },
@@ -2169,11 +2745,11 @@
         "c2jName" : "ClientSubnet",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The client subnet to which this broker node belongs.</p>",
+        "documentation" : "\n            <p>The client subnet to which this broker node belongs.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@param clientSubnet The client subnet to which this broker node belongs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@param clientSubnet <p>The client subnet to which this broker node belongs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withClientSubnet",
-        "getterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@return The client subnet to which this broker node belongs.*/",
+        "getterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@return <p>The client subnet to which this broker node belongs.</p>*/",
         "getterMethodName" : "getClientSubnet",
         "getterModel" : {
           "returnType" : "String",
@@ -2207,7 +2783,7 @@
         "marshallingType" : "STRING",
         "name" : "ClientSubnet",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@param clientSubnet The client subnet to which this broker node belongs.*/",
+        "setterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@param clientSubnet <p>The client subnet to which this broker node belongs.</p>*/",
         "setterMethodName" : "setClientSubnet",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2221,13 +2797,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@param clientSubnet The client subnet to which this broker node belongs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@param clientSubnet <p>The client subnet to which this broker node belongs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "clientSubnet",
           "variableType" : "String",
-          "documentation" : "<p>The client subnet to which this broker node belongs.</p>",
+          "documentation" : "\n            <p>The client subnet to which this broker node belongs.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -2236,11 +2812,11 @@
         "c2jName" : "ClientVpcIpAddress",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The virtual private cloud (VPC) of the client.</p>",
+        "documentation" : "\n            <p>The virtual private cloud (VPC) of the client.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withClientVpcIpAddress",
-        "getterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@return The virtual private cloud (VPC) of the client.*/",
+        "getterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@return <p>The virtual private cloud (VPC) of the client.</p>*/",
         "getterMethodName" : "getClientVpcIpAddress",
         "getterModel" : {
           "returnType" : "String",
@@ -2274,7 +2850,7 @@
         "marshallingType" : "STRING",
         "name" : "ClientVpcIpAddress",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) of the client.*/",
+        "setterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) of the client.</p>*/",
         "setterMethodName" : "setClientVpcIpAddress",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2288,13 +2864,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "clientVpcIpAddress",
           "variableType" : "String",
-          "documentation" : "<p>The virtual private cloud (VPC) of the client.</p>",
+          "documentation" : "\n            <p>The virtual private cloud (VPC) of the client.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -2303,11 +2879,11 @@
         "c2jName" : "CurrentBrokerSoftwareInfo",
         "c2jShape" : "BrokerSoftwareInfo",
         "deprecated" : false,
-        "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+        "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withCurrentBrokerSoftwareInfo",
-        "getterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
+        "getterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@return <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
         "getterMethodName" : "getCurrentBrokerSoftwareInfo",
         "getterModel" : {
           "returnType" : "BrokerSoftwareInfo",
@@ -2341,7 +2917,7 @@
         "marshallingType" : "STRUCTURED",
         "name" : "CurrentBrokerSoftwareInfo",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
+        "setterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
         "setterMethodName" : "setCurrentBrokerSoftwareInfo",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2355,82 +2931,231 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "BrokerSoftwareInfo",
           "variableName" : "currentBrokerSoftwareInfo",
           "variableType" : "BrokerSoftwareInfo",
-          "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+          "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
           "simpleType" : "BrokerSoftwareInfo",
           "variableSetterType" : "BrokerSoftwareInfo"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "AttachedENIId" : {
-          "c2jName" : "AttachedENIId",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The attached elastic network interface of the broker.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withAttachedENIId",
-          "getterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@return The attached elastic network interface of the broker.*/",
-          "getterMethodName" : "getAttachedENIId",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "attachedENIId",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "attachedENIId",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "AttachedENIId",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.*/",
-          "setterMethodName" : "setAttachedENIId",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "attachedENIId",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+      }, {
+        "c2jName" : "Endpoints",
+        "c2jShape" : "__listOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Endpoints for accessing the broker.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n@param endpoints <p>Endpoints for accessing the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEndpoints",
+        "getterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n@return <p>Endpoints for accessing the broker.</p>*/",
+        "getterMethodName" : "getEndpoints",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "endpoints",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "endpoints",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Endpoints",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n@param endpoints <p>Endpoints for accessing the broker.</p>*/",
+        "setterMethodName" : "setEndpoints",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "endpoints",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEndpoints(java.util.Collection)} or {@link #withEndpoints(java.util.Collection)} if you want to override the existing values.</p>\n@param endpoints <p>Endpoints for accessing the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "endpoints",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>Endpoints for accessing the broker.</p>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "AttachedENIId" : {
+          "c2jName" : "AttachedENIId",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAttachedENIId",
+          "getterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@return <p>The attached elastic network interface of the broker.</p>*/",
+          "getterMethodName" : "getAttachedENIId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "attachedENIId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "attachedENIId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "AttachedENIId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>*/",
+          "setterMethodName" : "setAttachedENIId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "attachedENIId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "attachedENIId",
             "variableType" : "String",
-            "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+            "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -2440,11 +3165,11 @@
           "c2jName" : "BrokerId",
           "c2jShape" : "__double",
           "deprecated" : false,
-          "documentation" : "<p>The ID of the broker.</p>",
+          "documentation" : "\n            <p>The ID of the broker.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The ID of the broker.</p>\n@param brokerId The ID of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@param brokerId <p>The ID of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withBrokerId",
-          "getterDocumentation" : "/**<p>The ID of the broker.</p>\n@return The ID of the broker.*/",
+          "getterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@return <p>The ID of the broker.</p>*/",
           "getterMethodName" : "getBrokerId",
           "getterModel" : {
             "returnType" : "Double",
@@ -2478,7 +3203,7 @@
           "marshallingType" : "DOUBLE",
           "name" : "BrokerId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The ID of the broker.</p>\n@param brokerId The ID of the broker.*/",
+          "setterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@param brokerId <p>The ID of the broker.</p>*/",
           "setterMethodName" : "setBrokerId",
           "setterModel" : {
             "timestampFormat" : null,
@@ -2492,13 +3217,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The ID of the broker.</p>\n@param brokerId The ID of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The ID of the broker.</p>\n         \n@param brokerId <p>The ID of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Double",
             "variableName" : "brokerId",
             "variableType" : "Double",
-            "documentation" : "<p>The ID of the broker.</p>",
+            "documentation" : "\n            <p>The ID of the broker.</p>\n         ",
             "simpleType" : "Double",
             "variableSetterType" : "Double"
           },
@@ -2508,11 +3233,11 @@
           "c2jName" : "ClientSubnet",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The client subnet to which this broker node belongs.</p>",
+          "documentation" : "\n            <p>The client subnet to which this broker node belongs.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@param clientSubnet The client subnet to which this broker node belongs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@param clientSubnet <p>The client subnet to which this broker node belongs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClientSubnet",
-          "getterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@return The client subnet to which this broker node belongs.*/",
+          "getterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@return <p>The client subnet to which this broker node belongs.</p>*/",
           "getterMethodName" : "getClientSubnet",
           "getterModel" : {
             "returnType" : "String",
@@ -2546,7 +3271,7 @@
           "marshallingType" : "STRING",
           "name" : "ClientSubnet",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@param clientSubnet The client subnet to which this broker node belongs.*/",
+          "setterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@param clientSubnet <p>The client subnet to which this broker node belongs.</p>*/",
           "setterMethodName" : "setClientSubnet",
           "setterModel" : {
             "timestampFormat" : null,
@@ -2560,13 +3285,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The client subnet to which this broker node belongs.</p>\n@param clientSubnet The client subnet to which this broker node belongs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The client subnet to which this broker node belongs.</p>\n         \n@param clientSubnet <p>The client subnet to which this broker node belongs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "clientSubnet",
             "variableType" : "String",
-            "documentation" : "<p>The client subnet to which this broker node belongs.</p>",
+            "documentation" : "\n            <p>The client subnet to which this broker node belongs.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -2576,11 +3301,11 @@
           "c2jName" : "ClientVpcIpAddress",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The virtual private cloud (VPC) of the client.</p>",
+          "documentation" : "\n            <p>The virtual private cloud (VPC) of the client.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClientVpcIpAddress",
-          "getterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@return The virtual private cloud (VPC) of the client.*/",
+          "getterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@return <p>The virtual private cloud (VPC) of the client.</p>*/",
           "getterMethodName" : "getClientVpcIpAddress",
           "getterModel" : {
             "returnType" : "String",
@@ -2614,7 +3339,7 @@
           "marshallingType" : "STRING",
           "name" : "ClientVpcIpAddress",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) of the client.*/",
+          "setterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) of the client.</p>*/",
           "setterMethodName" : "setClientVpcIpAddress",
           "setterModel" : {
             "timestampFormat" : null,
@@ -2628,13 +3353,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The virtual private cloud (VPC) of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "clientVpcIpAddress",
             "variableType" : "String",
-            "documentation" : "<p>The virtual private cloud (VPC) of the client.</p>",
+            "documentation" : "\n            <p>The virtual private cloud (VPC) of the client.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -2644,11 +3369,11 @@
           "c2jName" : "CurrentBrokerSoftwareInfo",
           "c2jShape" : "BrokerSoftwareInfo",
           "deprecated" : false,
-          "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+          "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withCurrentBrokerSoftwareInfo",
-          "getterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@return <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
           "getterMethodName" : "getCurrentBrokerSoftwareInfo",
           "getterModel" : {
             "returnType" : "BrokerSoftwareInfo",
@@ -2682,7 +3407,7 @@
           "marshallingType" : "STRUCTURED",
           "name" : "CurrentBrokerSoftwareInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
           "setterMethodName" : "setCurrentBrokerSoftwareInfo",
           "setterModel" : {
             "timestampFormat" : null,
@@ -2696,90 +3421,240 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "BrokerSoftwareInfo",
             "variableName" : "currentBrokerSoftwareInfo",
             "variableType" : "BrokerSoftwareInfo",
-            "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+            "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
             "simpleType" : "BrokerSoftwareInfo",
             "variableSetterType" : "BrokerSoftwareInfo"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "BrokerNodeInfo",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "BrokerNodeInfo",
-        "variableName" : "brokerNodeInfo",
-        "variableType" : "BrokerNodeInfo",
-        "documentation" : null,
-        "simpleType" : "BrokerNodeInfo",
-        "variableSetterType" : "BrokerNodeInfo"
-      },
-      "wrapper" : false
-    },
-    "BrokerSoftwareInfo" : {
-      "c2jName" : "BrokerSoftwareInfo",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Information about the current software installed on the cluster.</p>",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "ConfigurationArn",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@param configurationArn The Amazon Resource Name (ARN) of the configuration used for the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withConfigurationArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@return The Amazon Resource Name (ARN) of the configuration used for the cluster.*/",
-        "getterMethodName" : "getConfigurationArn",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "configurationArn",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "configurationArn",
-          "uri" : false
         },
-        "idempotencyToken" : false,
+        "Endpoints" : {
+          "c2jName" : "Endpoints",
+          "c2jShape" : "__listOf__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Endpoints for accessing the broker.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n@param endpoints <p>Endpoints for accessing the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEndpoints",
+          "getterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n@return <p>Endpoints for accessing the broker.</p>*/",
+          "getterMethodName" : "getEndpoints",
+          "getterModel" : {
+            "returnType" : "java.util.List<String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "endpoints",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "endpoints",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Endpoints",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n@param endpoints <p>Endpoints for accessing the broker.</p>*/",
+          "setterMethodName" : "setEndpoints",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "endpoints",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Endpoints for accessing the broker.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEndpoints(java.util.Collection)} or {@link #withEndpoints(java.util.Collection)} if you want to override the existing values.</p>\n@param endpoints <p>Endpoints for accessing the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "endpoints",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>Endpoints for accessing the broker.</p>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BrokerNodeInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BrokerNodeInfo",
+        "variableName" : "brokerNodeInfo",
+        "variableType" : "BrokerNodeInfo",
+        "documentation" : null,
+        "simpleType" : "BrokerNodeInfo",
+        "variableSetterType" : "BrokerNodeInfo"
+      },
+      "wrapper" : false
+    },
+    "BrokerSoftwareInfo" : {
+      "c2jName" : "BrokerSoftwareInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Information about the current software installed on the cluster.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ConfigurationArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@param configurationArn <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withConfigurationArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>*/",
+        "getterMethodName" : "getConfigurationArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "configurationArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "configurationArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
         "list" : false,
@@ -2790,7 +3665,7 @@
         "marshallingType" : "STRING",
         "name" : "ConfigurationArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@param configurationArn The Amazon Resource Name (ARN) of the configuration used for the cluster.*/",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@param configurationArn <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>*/",
         "setterMethodName" : "setConfigurationArn",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2804,13 +3679,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@param configurationArn The Amazon Resource Name (ARN) of the configuration used for the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@param configurationArn <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "configurationArn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -2819,11 +3694,11 @@
         "c2jName" : "ConfigurationRevision",
         "c2jShape" : "__long",
         "deprecated" : false,
-        "documentation" : "<p>The revision of the configuration to use.</p>",
+        "documentation" : "\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param configurationRevision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@param configurationRevision <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withConfigurationRevision",
-        "getterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@return The revision of the configuration to use.*/",
+        "getterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@return <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>*/",
         "getterMethodName" : "getConfigurationRevision",
         "getterModel" : {
           "returnType" : "Long",
@@ -2857,7 +3732,7 @@
         "marshallingType" : "LONG",
         "name" : "ConfigurationRevision",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param configurationRevision The revision of the configuration to use.*/",
+        "setterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@param configurationRevision <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>*/",
         "setterMethodName" : "setConfigurationRevision",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2871,13 +3746,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param configurationRevision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@param configurationRevision <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Long",
           "variableName" : "configurationRevision",
           "variableType" : "Long",
-          "documentation" : "<p>The revision of the configuration to use.</p>",
+          "documentation" : "\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         ",
           "simpleType" : "Long",
           "variableSetterType" : "Long"
         },
@@ -2886,11 +3761,11 @@
         "c2jName" : "KafkaVersion",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The version of Apache Kafka.</p>",
+        "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withKafkaVersion",
-        "getterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@return The version of Apache Kafka.*/",
+        "getterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@return <p>The version of Apache Kafka.</p>*/",
         "getterMethodName" : "getKafkaVersion",
         "getterModel" : {
           "returnType" : "String",
@@ -2924,7 +3799,7 @@
         "marshallingType" : "STRING",
         "name" : "KafkaVersion",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.*/",
+        "setterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>*/",
         "setterMethodName" : "setKafkaVersion",
         "setterModel" : {
           "timestampFormat" : null,
@@ -2938,13 +3813,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "kafkaVersion",
           "variableType" : "String",
-          "documentation" : "<p>The version of Apache Kafka.</p>",
+          "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -2955,11 +3830,11 @@
           "c2jName" : "ConfigurationArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@param configurationArn The Amazon Resource Name (ARN) of the configuration used for the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@param configurationArn <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withConfigurationArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@return The Amazon Resource Name (ARN) of the configuration used for the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>*/",
           "getterMethodName" : "getConfigurationArn",
           "getterModel" : {
             "returnType" : "String",
@@ -2993,7 +3868,7 @@
           "marshallingType" : "STRING",
           "name" : "ConfigurationArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@param configurationArn The Amazon Resource Name (ARN) of the configuration used for the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@param configurationArn <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>*/",
           "setterMethodName" : "setConfigurationArn",
           "setterModel" : {
             "timestampFormat" : null,
@@ -3007,13 +3882,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>\n@param configurationArn The Amazon Resource Name (ARN) of the configuration used for the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         \n@param configurationArn <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "configurationArn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -3023,11 +3898,11 @@
           "c2jName" : "ConfigurationRevision",
           "c2jShape" : "__long",
           "deprecated" : false,
-          "documentation" : "<p>The revision of the configuration to use.</p>",
+          "documentation" : "\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param configurationRevision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@param configurationRevision <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withConfigurationRevision",
-          "getterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@return The revision of the configuration to use.*/",
+          "getterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@return <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>*/",
           "getterMethodName" : "getConfigurationRevision",
           "getterModel" : {
             "returnType" : "Long",
@@ -3061,7 +3936,7 @@
           "marshallingType" : "LONG",
           "name" : "ConfigurationRevision",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param configurationRevision The revision of the configuration to use.*/",
+          "setterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@param configurationRevision <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>*/",
           "setterMethodName" : "setConfigurationRevision",
           "setterModel" : {
             "timestampFormat" : null,
@@ -3075,13 +3950,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param configurationRevision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         \n@param configurationRevision <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Long",
             "variableName" : "configurationRevision",
             "variableType" : "Long",
-            "documentation" : "<p>The revision of the configuration to use.</p>",
+            "documentation" : "\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         ",
             "simpleType" : "Long",
             "variableSetterType" : "Long"
           },
@@ -3091,11 +3966,11 @@
           "c2jName" : "KafkaVersion",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The version of Apache Kafka.</p>",
+          "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withKafkaVersion",
-          "getterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@return The version of Apache Kafka.*/",
+          "getterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@return <p>The version of Apache Kafka.</p>*/",
           "getterMethodName" : "getKafkaVersion",
           "getterModel" : {
             "returnType" : "String",
@@ -3129,7 +4004,7 @@
           "marshallingType" : "STRING",
           "name" : "KafkaVersion",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.*/",
+          "setterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>*/",
           "setterMethodName" : "setKafkaVersion",
           "setterModel" : {
             "timestampFormat" : null,
@@ -3143,13 +4018,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "kafkaVersion",
             "variableType" : "String",
-            "documentation" : "<p>The version of Apache Kafka.</p>",
+            "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -3177,8 +4052,8 @@
       },
       "wrapper" : false
     },
-    "ClusterInfo" : {
-      "c2jName" : "ClusterInfo",
+    "ClientAuthentication" : {
+      "c2jName" : "ClientAuthentication",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -3186,7 +4061,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Returns information about a cluster.</p>",
+      "documentation" : "\n            <p>Includes all client authentication information.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -3196,17 +4071,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "BrokerNodeGroupInfo",
-        "c2jShape" : "BrokerNodeGroupInfo",
+        "c2jName" : "Tls",
+        "c2jShape" : "Tls",
         "deprecated" : false,
-        "documentation" : "<p>Information about the broker nodes.</p>",
+        "documentation" : "\n            <p>Details for ClientAuthentication using TLS.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@param brokerNodeGroupInfo Information about the broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
-        "getterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@return Information about the broker nodes.*/",
-        "getterMethodName" : "getBrokerNodeGroupInfo",
+        "fluentSetterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@param tls <p>Details for ClientAuthentication using TLS.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTls",
+        "getterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@return <p>Details for ClientAuthentication using TLS.</p>*/",
+        "getterMethodName" : "getTls",
         "getterModel" : {
-          "returnType" : "BrokerNodeGroupInfo",
+          "returnType" : "Tls",
           "documentation" : null
         },
         "http" : {
@@ -3219,11 +4094,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "brokerNodeGroupInfo",
+          "marshallLocationName" : "tls",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "brokerNodeGroupInfo",
+          "unmarshallLocationName" : "tls",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -3235,110 +4110,203 @@
         "mapModel" : null,
         "marshallingTargetClass" : "StructuredPojo",
         "marshallingType" : "STRUCTURED",
-        "name" : "BrokerNodeGroupInfo",
+        "name" : "Tls",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@param brokerNodeGroupInfo Information about the broker nodes.*/",
-        "setterMethodName" : "setBrokerNodeGroupInfo",
+        "setterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@param tls <p>Details for ClientAuthentication using TLS.</p>*/",
+        "setterMethodName" : "setTls",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerNodeGroupInfo",
-          "variableName" : "brokerNodeGroupInfo",
-          "variableType" : "BrokerNodeGroupInfo",
+          "variableDeclarationType" : "Tls",
+          "variableName" : "tls",
+          "variableType" : "Tls",
           "documentation" : "",
-          "simpleType" : "BrokerNodeGroupInfo",
-          "variableSetterType" : "BrokerNodeGroupInfo"
+          "simpleType" : "Tls",
+          "variableSetterType" : "Tls"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@param brokerNodeGroupInfo Information about the broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@param tls <p>Details for ClientAuthentication using TLS.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerNodeGroupInfo",
-          "variableName" : "brokerNodeGroupInfo",
-          "variableType" : "BrokerNodeGroupInfo",
-          "documentation" : "<p>Information about the broker nodes.</p>",
-          "simpleType" : "BrokerNodeGroupInfo",
-          "variableSetterType" : "BrokerNodeGroupInfo"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "ClusterArn",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "getterMethodName" : "getClusterArn",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterArn",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "clusterArn",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "ClusterArn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "setterMethodName" : "setClusterArn",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
-          "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "Tls",
+          "variableName" : "tls",
+          "variableType" : "Tls",
+          "documentation" : "\n            <p>Details for ClientAuthentication using TLS.</p>\n         ",
+          "simpleType" : "Tls",
+          "variableSetterType" : "Tls"
         },
         "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Tls" : {
+          "c2jName" : "Tls",
+          "c2jShape" : "Tls",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Details for ClientAuthentication using TLS.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@param tls <p>Details for ClientAuthentication using TLS.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTls",
+          "getterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@return <p>Details for ClientAuthentication using TLS.</p>*/",
+          "getterMethodName" : "getTls",
+          "getterModel" : {
+            "returnType" : "Tls",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tls",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tls",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "Tls",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@param tls <p>Details for ClientAuthentication using TLS.</p>*/",
+          "setterMethodName" : "setTls",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Tls",
+            "variableName" : "tls",
+            "variableType" : "Tls",
+            "documentation" : "",
+            "simpleType" : "Tls",
+            "variableSetterType" : "Tls"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Details for ClientAuthentication using TLS.</p>\n         \n@param tls <p>Details for ClientAuthentication using TLS.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Tls",
+            "variableName" : "tls",
+            "variableType" : "Tls",
+            "documentation" : "\n            <p>Details for ClientAuthentication using TLS.</p>\n         ",
+            "simpleType" : "Tls",
+            "variableSetterType" : "Tls"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ClientAuthentication",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ClientAuthentication",
+        "variableName" : "clientAuthentication",
+        "variableType" : "ClientAuthentication",
+        "documentation" : null,
+        "simpleType" : "ClientAuthentication",
+        "variableSetterType" : "ClientAuthentication"
+      },
+      "wrapper" : false
+    },
+    "ClientBroker" : {
+      "c2jName" : "ClientBroker",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Client-broker encryption in transit setting.</p>\n         ",
+      "enums" : [ {
+        "name" : "TLS",
+        "value" : "TLS"
       }, {
-        "c2jName" : "ClusterName",
+        "name" : "TLS_PLAINTEXT",
+        "value" : "TLS_PLAINTEXT"
+      }, {
+        "name" : "PLAINTEXT",
+        "value" : "PLAINTEXT"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ClientBroker",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ClientBroker",
+        "variableName" : "clientBroker",
+        "variableType" : "ClientBroker",
+        "documentation" : null,
+        "simpleType" : "ClientBroker",
+        "variableSetterType" : "ClientBroker"
+      },
+      "wrapper" : false
+    },
+    "ClusterInfo" : {
+      "c2jName" : "ClusterInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns information about a cluster.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ActiveOperationArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The name of the cluster.</p>",
+        "documentation" : "\n            <p>Arn of active cluster operation.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterName",
-        "getterDocumentation" : "/**<p>The name of the cluster.</p>\n@return The name of the cluster.*/",
-        "getterMethodName" : "getClusterName",
+        "fluentSetterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@param activeOperationArn <p>Arn of active cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withActiveOperationArn",
+        "getterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@return <p>Arn of active cluster operation.</p>*/",
+        "getterMethodName" : "getActiveOperationArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -3353,11 +4321,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterName",
+          "marshallLocationName" : "activeOperationArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterName",
+          "unmarshallLocationName" : "activeOperationArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -3369,14 +4337,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ClusterName",
+        "name" : "ActiveOperationArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.*/",
-        "setterMethodName" : "setClusterName",
+        "setterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@param activeOperationArn <p>Arn of active cluster operation.</p>*/",
+        "setterMethodName" : "setActiveOperationArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterName",
+          "variableName" : "activeOperationArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -3385,29 +4353,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@param activeOperationArn <p>Arn of active cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterName",
+          "variableName" : "activeOperationArn",
           "variableType" : "String",
-          "documentation" : "<p>The name of the cluster.</p>",
+          "documentation" : "\n            <p>Arn of active cluster operation.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "CreationTime",
-        "c2jShape" : "__timestampIso8601",
+        "c2jName" : "BrokerNodeGroupInfo",
+        "c2jShape" : "BrokerNodeGroupInfo",
         "deprecated" : false,
-        "documentation" : "<p>The time when the cluster was created.</p>",
+        "documentation" : "\n            <p>Information about the broker nodes.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@param creationTime The time when the cluster was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCreationTime",
-        "getterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@return The time when the cluster was created.*/",
-        "getterMethodName" : "getCreationTime",
+        "fluentSetterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
+        "getterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@return <p>Information about the broker nodes.</p>*/",
+        "getterMethodName" : "getBrokerNodeGroupInfo",
         "getterModel" : {
-          "returnType" : "java.util.Date",
+          "returnType" : "BrokerNodeGroupInfo",
           "documentation" : null
         },
         "http" : {
@@ -3420,11 +4388,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "creationTime",
+          "marshallLocationName" : "brokerNodeGroupInfo",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "creationTime",
+          "unmarshallLocationName" : "brokerNodeGroupInfo",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -3434,47 +4402,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "java.util.Date",
-        "marshallingType" : "DATE",
-        "name" : "CreationTime",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "BrokerNodeGroupInfo",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@param creationTime The time when the cluster was created.*/",
-        "setterMethodName" : "setCreationTime",
+        "setterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes.</p>*/",
+        "setterMethodName" : "setBrokerNodeGroupInfo",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
+          "variableDeclarationType" : "BrokerNodeGroupInfo",
+          "variableName" : "brokerNodeGroupInfo",
+          "variableType" : "BrokerNodeGroupInfo",
           "documentation" : "",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
+          "simpleType" : "BrokerNodeGroupInfo",
+          "variableSetterType" : "BrokerNodeGroupInfo"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@param creationTime The time when the cluster was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
-          "timestampFormat" : "iso8601",
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
-          "documentation" : "<p>The time when the cluster was created.</p>",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
+          "timestampFormat" : null,
+          "variableDeclarationType" : "BrokerNodeGroupInfo",
+          "variableName" : "brokerNodeGroupInfo",
+          "variableType" : "BrokerNodeGroupInfo",
+          "documentation" : "\n            <p>Information about the broker nodes.</p>\n         ",
+          "simpleType" : "BrokerNodeGroupInfo",
+          "variableSetterType" : "BrokerNodeGroupInfo"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "CurrentBrokerSoftwareInfo",
-        "c2jShape" : "BrokerSoftwareInfo",
+        "c2jName" : "ClientAuthentication",
+        "c2jShape" : "ClientAuthentication",
         "deprecated" : false,
-        "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+        "documentation" : "\n            <p>Includes all client authentication information.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCurrentBrokerSoftwareInfo",
-        "getterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
-        "getterMethodName" : "getCurrentBrokerSoftwareInfo",
+        "fluentSetterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClientAuthentication",
+        "getterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@return <p>Includes all client authentication information.</p>*/",
+        "getterMethodName" : "getClientAuthentication",
         "getterModel" : {
-          "returnType" : "BrokerSoftwareInfo",
+          "returnType" : "ClientAuthentication",
           "documentation" : null
         },
         "http" : {
@@ -3487,11 +4455,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "currentBrokerSoftwareInfo",
+          "marshallLocationName" : "clientAuthentication",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "currentBrokerSoftwareInfo",
+          "unmarshallLocationName" : "clientAuthentication",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -3503,43 +4471,43 @@
         "mapModel" : null,
         "marshallingTargetClass" : "StructuredPojo",
         "marshallingType" : "STRUCTURED",
-        "name" : "CurrentBrokerSoftwareInfo",
+        "name" : "ClientAuthentication",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
-        "setterMethodName" : "setCurrentBrokerSoftwareInfo",
+        "setterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication information.</p>*/",
+        "setterMethodName" : "setClientAuthentication",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerSoftwareInfo",
-          "variableName" : "currentBrokerSoftwareInfo",
-          "variableType" : "BrokerSoftwareInfo",
+          "variableDeclarationType" : "ClientAuthentication",
+          "variableName" : "clientAuthentication",
+          "variableType" : "ClientAuthentication",
           "documentation" : "",
-          "simpleType" : "BrokerSoftwareInfo",
-          "variableSetterType" : "BrokerSoftwareInfo"
+          "simpleType" : "ClientAuthentication",
+          "variableSetterType" : "ClientAuthentication"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerSoftwareInfo",
-          "variableName" : "currentBrokerSoftwareInfo",
-          "variableType" : "BrokerSoftwareInfo",
-          "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
-          "simpleType" : "BrokerSoftwareInfo",
-          "variableSetterType" : "BrokerSoftwareInfo"
+          "variableDeclarationType" : "ClientAuthentication",
+          "variableName" : "clientAuthentication",
+          "variableType" : "ClientAuthentication",
+          "documentation" : "\n            <p>Includes all client authentication information.</p>\n         ",
+          "simpleType" : "ClientAuthentication",
+          "variableSetterType" : "ClientAuthentication"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "CurrentVersion",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The current version of the MSK cluster.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCurrentVersion",
-        "getterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@return The current version of the MSK cluster.*/",
-        "getterMethodName" : "getCurrentVersion",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -3554,11 +4522,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "currentVersion",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "currentVersion",
+          "unmarshallLocationName" : "clusterArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -3570,14 +4538,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "CurrentVersion",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.*/",
-        "setterMethodName" : "setCurrentVersion",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "currentVersion",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -3586,29 +4554,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "currentVersion",
+          "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The current version of the MSK cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "EncryptionInfo",
-        "c2jShape" : "EncryptionInfo",
+        "c2jName" : "ClusterName",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>Includes all encryption-related information.</p>",
+        "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withEncryptionInfo",
-        "getterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@return Includes all encryption-related information.*/",
-        "getterMethodName" : "getEncryptionInfo",
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterName",
+        "getterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@return <p>The name of the cluster.</p>*/",
+        "getterMethodName" : "getClusterName",
         "getterModel" : {
-          "returnType" : "EncryptionInfo",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -3621,11 +4589,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "encryptionInfo",
+          "marshallLocationName" : "clusterName",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "encryptionInfo",
+          "unmarshallLocationName" : "clusterName",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -3635,16 +4603,284 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "EncryptionInfo",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterName",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.*/",
-        "setterMethodName" : "setEncryptionInfo",
+        "setterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>*/",
+        "setterMethodName" : "setClusterName",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "EncryptionInfo",
-          "variableName" : "encryptionInfo",
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterName",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "CreationTime",
+        "c2jShape" : "__timestampIso8601",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The time when the cluster was created.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@param creationTime <p>The time when the cluster was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@return <p>The time when the cluster was created.</p>*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@param creationTime <p>The time when the cluster was created.</p>*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@param creationTime <p>The time when the cluster was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "iso8601",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "\n            <p>The time when the cluster was created.</p>\n         ",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "CurrentBrokerSoftwareInfo",
+        "c2jShape" : "BrokerSoftwareInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCurrentBrokerSoftwareInfo",
+        "getterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@return <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
+        "getterMethodName" : "getCurrentBrokerSoftwareInfo",
+        "getterModel" : {
+          "returnType" : "BrokerSoftwareInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "currentBrokerSoftwareInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "currentBrokerSoftwareInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "CurrentBrokerSoftwareInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
+        "setterMethodName" : "setCurrentBrokerSoftwareInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "BrokerSoftwareInfo",
+          "variableName" : "currentBrokerSoftwareInfo",
+          "variableType" : "BrokerSoftwareInfo",
+          "documentation" : "",
+          "simpleType" : "BrokerSoftwareInfo",
+          "variableSetterType" : "BrokerSoftwareInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "BrokerSoftwareInfo",
+          "variableName" : "currentBrokerSoftwareInfo",
+          "variableType" : "BrokerSoftwareInfo",
+          "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
+          "simpleType" : "BrokerSoftwareInfo",
+          "variableSetterType" : "BrokerSoftwareInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "CurrentVersion",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCurrentVersion",
+        "getterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@return <p>The current version of the MSK cluster.</p>*/",
+        "getterMethodName" : "getCurrentVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "currentVersion",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "currentVersion",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "CurrentVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>*/",
+        "setterMethodName" : "setCurrentVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "currentVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "currentVersion",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "EncryptionInfo",
+        "c2jShape" : "EncryptionInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEncryptionInfo",
+        "getterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@return <p>Includes all encryption-related information.</p>*/",
+        "getterMethodName" : "getEncryptionInfo",
+        "getterModel" : {
+          "returnType" : "EncryptionInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "encryptionInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "encryptionInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "EncryptionInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>*/",
+        "setterMethodName" : "setEncryptionInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "EncryptionInfo",
+          "variableName" : "encryptionInfo",
           "variableType" : "EncryptionInfo",
           "documentation" : "",
           "simpleType" : "EncryptionInfo",
@@ -3653,13 +4889,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "EncryptionInfo",
           "variableName" : "encryptionInfo",
           "variableType" : "EncryptionInfo",
-          "documentation" : "<p>Includes all encryption-related information.</p>",
+          "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
           "simpleType" : "EncryptionInfo",
           "variableSetterType" : "EncryptionInfo"
         },
@@ -3668,11 +4904,11 @@
         "c2jName" : "EnhancedMonitoring",
         "c2jShape" : "EnhancedMonitoring",
         "deprecated" : false,
-        "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
+        "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         ",
         "enumType" : "EnhancedMonitoring",
-        "fluentSetterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+        "fluentSetterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@param enhancedMonitoring <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
         "fluentSetterMethodName" : "withEnhancedMonitoring",
-        "getterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
+        "getterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@return <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@see EnhancedMonitoring*/",
         "getterMethodName" : "getEnhancedMonitoring",
         "getterModel" : {
           "returnType" : "String",
@@ -3706,7 +4942,7 @@
         "marshallingType" : "STRING",
         "name" : "EnhancedMonitoring",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
+        "setterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@param enhancedMonitoring <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@see EnhancedMonitoring*/",
         "setterMethodName" : "setEnhancedMonitoring",
         "setterModel" : {
           "timestampFormat" : null,
@@ -3720,13 +4956,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+        "varargSetterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@param enhancedMonitoring <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "enhancedMonitoring",
           "variableType" : "String",
-          "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
+          "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -3735,11 +4971,11 @@
         "c2jName" : "NumberOfBrokerNodes",
         "c2jShape" : "__integer",
         "deprecated" : false,
-        "documentation" : "<p>The number of Kafka broker nodes in the cluster.</p>",
+        "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withNumberOfBrokerNodes",
-        "getterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@return The number of Kafka broker nodes in the cluster.*/",
+        "getterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@return <p>The number of broker nodes in the cluster.</p>*/",
         "getterMethodName" : "getNumberOfBrokerNodes",
         "getterModel" : {
           "returnType" : "Integer",
@@ -3773,7 +5009,7 @@
         "marshallingType" : "INTEGER",
         "name" : "NumberOfBrokerNodes",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the cluster.*/",
+        "setterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>*/",
         "setterMethodName" : "setNumberOfBrokerNodes",
         "setterModel" : {
           "timestampFormat" : null,
@@ -3787,13 +5023,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Integer",
           "variableName" : "numberOfBrokerNodes",
           "variableType" : "Integer",
-          "documentation" : "<p>The number of Kafka broker nodes in the cluster.</p>",
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
           "simpleType" : "Integer",
           "variableSetterType" : "Integer"
         },
@@ -3802,11 +5038,11 @@
         "c2jName" : "State",
         "c2jShape" : "ClusterState",
         "deprecated" : false,
-        "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+        "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
         "enumType" : "ClusterState",
-        "fluentSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
         "fluentSetterMethodName" : "withState",
-        "getterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
+        "getterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@return <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
         "getterMethodName" : "getState",
         "getterModel" : {
           "returnType" : "String",
@@ -3840,7 +5076,7 @@
         "marshallingType" : "STRING",
         "name" : "State",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
+        "setterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
         "setterMethodName" : "setState",
         "setterModel" : {
           "timestampFormat" : null,
@@ -3854,29 +5090,178 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "varargSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "state",
           "variableType" : "String",
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "ZookeeperConnectString",
-        "c2jShape" : "__string",
+        "c2jName" : "Tags",
+        "c2jShape" : "__mapOf__string",
         "deprecated" : false,
-        "documentation" : "<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>",
+        "documentation" : "\n            <p>Tags attached to the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@param zookeeperConnectString The connection string to use to connect to the Apache ZooKeeper cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withZookeeperConnectString",
-        "getterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@return The connection string to use to connect to the Apache ZooKeeper cluster.*/",
-        "getterMethodName" : "getZookeeperConnectString",
+        "fluentSetterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@param tags <p>Tags attached to the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@return <p>Tags attached to the cluster.</p>*/",
+        "getterMethodName" : "getTags",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "java.util.Map<String,String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getValue",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "value",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "value",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Value",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
+        },
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@param tags <p>Tags attached to the cluster.</p>*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@param tags <p>Tags attached to the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "\n            <p>Tags attached to the cluster.</p>\n         ",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ZookeeperConnectString",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@param zookeeperConnectString <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withZookeeperConnectString",
+        "getterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@return <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>*/",
+        "getterMethodName" : "getZookeeperConnectString",
+        "getterModel" : {
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -3907,7 +5292,7 @@
         "marshallingType" : "STRING",
         "name" : "ZookeeperConnectString",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@param zookeeperConnectString The connection string to use to connect to the Apache ZooKeeper cluster.*/",
+        "setterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@param zookeeperConnectString <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>*/",
         "setterMethodName" : "setZookeeperConnectString",
         "setterModel" : {
           "timestampFormat" : null,
@@ -3921,28 +5306,96 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@param zookeeperConnectString The connection string to use to connect to the Apache ZooKeeper cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@param zookeeperConnectString <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "zookeeperConnectString",
           "variableType" : "String",
-          "documentation" : "<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>",
+          "documentation" : "\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
+        "ActiveOperationArn" : {
+          "c2jName" : "ActiveOperationArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Arn of active cluster operation.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@param activeOperationArn <p>Arn of active cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withActiveOperationArn",
+          "getterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@return <p>Arn of active cluster operation.</p>*/",
+          "getterMethodName" : "getActiveOperationArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "activeOperationArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "activeOperationArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ActiveOperationArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@param activeOperationArn <p>Arn of active cluster operation.</p>*/",
+          "setterMethodName" : "setActiveOperationArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activeOperationArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Arn of active cluster operation.</p>\n         \n@param activeOperationArn <p>Arn of active cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activeOperationArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>Arn of active cluster operation.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "BrokerNodeGroupInfo" : {
           "c2jName" : "BrokerNodeGroupInfo",
           "c2jShape" : "BrokerNodeGroupInfo",
           "deprecated" : false,
-          "documentation" : "<p>Information about the broker nodes.</p>",
+          "documentation" : "\n            <p>Information about the broker nodes.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@param brokerNodeGroupInfo Information about the broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
-          "getterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@return Information about the broker nodes.*/",
+          "getterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@return <p>Information about the broker nodes.</p>*/",
           "getterMethodName" : "getBrokerNodeGroupInfo",
           "getterModel" : {
             "returnType" : "BrokerNodeGroupInfo",
@@ -3976,7 +5429,7 @@
           "marshallingType" : "STRUCTURED",
           "name" : "BrokerNodeGroupInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@param brokerNodeGroupInfo Information about the broker nodes.*/",
+          "setterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes.</p>*/",
           "setterMethodName" : "setBrokerNodeGroupInfo",
           "setterModel" : {
             "timestampFormat" : null,
@@ -3990,27 +5443,95 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Information about the broker nodes.</p>\n@param brokerNodeGroupInfo Information about the broker nodes.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Information about the broker nodes.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "BrokerNodeGroupInfo",
             "variableName" : "brokerNodeGroupInfo",
             "variableType" : "BrokerNodeGroupInfo",
-            "documentation" : "<p>Information about the broker nodes.</p>",
+            "documentation" : "\n            <p>Information about the broker nodes.</p>\n         ",
             "simpleType" : "BrokerNodeGroupInfo",
             "variableSetterType" : "BrokerNodeGroupInfo"
           },
           "xmlNameSpaceUri" : null
         },
+        "ClientAuthentication" : {
+          "c2jName" : "ClientAuthentication",
+          "c2jShape" : "ClientAuthentication",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Includes all client authentication information.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClientAuthentication",
+          "getterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@return <p>Includes all client authentication information.</p>*/",
+          "getterMethodName" : "getClientAuthentication",
+          "getterModel" : {
+            "returnType" : "ClientAuthentication",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clientAuthentication",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clientAuthentication",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ClientAuthentication",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication information.</p>*/",
+          "setterMethodName" : "setClientAuthentication",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ClientAuthentication",
+            "variableName" : "clientAuthentication",
+            "variableType" : "ClientAuthentication",
+            "documentation" : "",
+            "simpleType" : "ClientAuthentication",
+            "variableSetterType" : "ClientAuthentication"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Includes all client authentication information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ClientAuthentication",
+            "variableName" : "clientAuthentication",
+            "variableType" : "ClientAuthentication",
+            "documentation" : "\n            <p>Includes all client authentication information.</p>\n         ",
+            "simpleType" : "ClientAuthentication",
+            "variableSetterType" : "ClientAuthentication"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "ClusterArn" : {
           "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
           "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
@@ -4044,7 +5565,7 @@
           "marshallingType" : "STRING",
           "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
           "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4058,13 +5579,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -4074,11 +5595,11 @@
           "c2jName" : "ClusterName",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The name of the cluster.</p>",
+          "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClusterName",
-          "getterDocumentation" : "/**<p>The name of the cluster.</p>\n@return The name of the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@return <p>The name of the cluster.</p>*/",
           "getterMethodName" : "getClusterName",
           "getterModel" : {
             "returnType" : "String",
@@ -4112,7 +5633,7 @@
           "marshallingType" : "STRING",
           "name" : "ClusterName",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>*/",
           "setterMethodName" : "setClusterName",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4126,13 +5647,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "clusterName",
             "variableType" : "String",
-            "documentation" : "<p>The name of the cluster.</p>",
+            "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -4142,11 +5663,11 @@
           "c2jName" : "CreationTime",
           "c2jShape" : "__timestampIso8601",
           "deprecated" : false,
-          "documentation" : "<p>The time when the cluster was created.</p>",
+          "documentation" : "\n            <p>The time when the cluster was created.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@param creationTime The time when the cluster was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@param creationTime <p>The time when the cluster was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withCreationTime",
-          "getterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@return The time when the cluster was created.*/",
+          "getterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@return <p>The time when the cluster was created.</p>*/",
           "getterMethodName" : "getCreationTime",
           "getterModel" : {
             "returnType" : "java.util.Date",
@@ -4180,7 +5701,7 @@
           "marshallingType" : "DATE",
           "name" : "CreationTime",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@param creationTime The time when the cluster was created.*/",
+          "setterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@param creationTime <p>The time when the cluster was created.</p>*/",
           "setterMethodName" : "setCreationTime",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4194,13 +5715,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The time when the cluster was created.</p>\n@param creationTime The time when the cluster was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The time when the cluster was created.</p>\n         \n@param creationTime <p>The time when the cluster was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : "iso8601",
             "variableDeclarationType" : "java.util.Date",
             "variableName" : "creationTime",
             "variableType" : "java.util.Date",
-            "documentation" : "<p>The time when the cluster was created.</p>",
+            "documentation" : "\n            <p>The time when the cluster was created.</p>\n         ",
             "simpleType" : "Date",
             "variableSetterType" : "java.util.Date"
           },
@@ -4210,11 +5731,11 @@
           "c2jName" : "CurrentBrokerSoftwareInfo",
           "c2jShape" : "BrokerSoftwareInfo",
           "deprecated" : false,
-          "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+          "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withCurrentBrokerSoftwareInfo",
-          "getterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@return <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
           "getterMethodName" : "getCurrentBrokerSoftwareInfo",
           "getterModel" : {
             "returnType" : "BrokerSoftwareInfo",
@@ -4248,7 +5769,7 @@
           "marshallingType" : "STRUCTURED",
           "name" : "CurrentBrokerSoftwareInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>*/",
           "setterMethodName" : "setCurrentBrokerSoftwareInfo",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4262,13 +5783,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@param currentBrokerSoftwareInfo Information about the version of software currently deployed on the Kafka brokers in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         \n@param currentBrokerSoftwareInfo <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "BrokerSoftwareInfo",
             "variableName" : "currentBrokerSoftwareInfo",
             "variableType" : "BrokerSoftwareInfo",
-            "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>",
+            "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         ",
             "simpleType" : "BrokerSoftwareInfo",
             "variableSetterType" : "BrokerSoftwareInfo"
           },
@@ -4278,11 +5799,11 @@
           "c2jName" : "CurrentVersion",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The current version of the MSK cluster.</p>",
+          "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withCurrentVersion",
-          "getterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@return The current version of the MSK cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@return <p>The current version of the MSK cluster.</p>*/",
           "getterMethodName" : "getCurrentVersion",
           "getterModel" : {
             "returnType" : "String",
@@ -4316,7 +5837,7 @@
           "marshallingType" : "STRING",
           "name" : "CurrentVersion",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>*/",
           "setterMethodName" : "setCurrentVersion",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4330,13 +5851,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "currentVersion",
             "variableType" : "String",
-            "documentation" : "<p>The current version of the MSK cluster.</p>",
+            "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -4346,11 +5867,11 @@
           "c2jName" : "EncryptionInfo",
           "c2jShape" : "EncryptionInfo",
           "deprecated" : false,
-          "documentation" : "<p>Includes all encryption-related information.</p>",
+          "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withEncryptionInfo",
-          "getterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@return Includes all encryption-related information.*/",
+          "getterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@return <p>Includes all encryption-related information.</p>*/",
           "getterMethodName" : "getEncryptionInfo",
           "getterModel" : {
             "returnType" : "EncryptionInfo",
@@ -4384,7 +5905,7 @@
           "marshallingType" : "STRUCTURED",
           "name" : "EncryptionInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.*/",
+          "setterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>*/",
           "setterMethodName" : "setEncryptionInfo",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4398,13 +5919,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "EncryptionInfo",
             "variableName" : "encryptionInfo",
             "variableType" : "EncryptionInfo",
-            "documentation" : "<p>Includes all encryption-related information.</p>",
+            "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
             "simpleType" : "EncryptionInfo",
             "variableSetterType" : "EncryptionInfo"
           },
@@ -4414,11 +5935,11 @@
           "c2jName" : "EnhancedMonitoring",
           "c2jShape" : "EnhancedMonitoring",
           "deprecated" : false,
-          "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
+          "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         ",
           "enumType" : "EnhancedMonitoring",
-          "fluentSetterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+          "fluentSetterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@param enhancedMonitoring <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
           "fluentSetterMethodName" : "withEnhancedMonitoring",
-          "getterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
+          "getterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@return <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@see EnhancedMonitoring*/",
           "getterMethodName" : "getEnhancedMonitoring",
           "getterModel" : {
             "returnType" : "String",
@@ -4452,7 +5973,7 @@
           "marshallingType" : "STRING",
           "name" : "EnhancedMonitoring",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
+          "setterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@param enhancedMonitoring <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@see EnhancedMonitoring*/",
           "setterMethodName" : "setEnhancedMonitoring",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4466,13 +5987,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+          "varargSetterDocumentation" : "/**\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         \n@param enhancedMonitoring <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "enhancedMonitoring",
             "variableType" : "String",
-            "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
+            "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -4482,11 +6003,11 @@
           "c2jName" : "NumberOfBrokerNodes",
           "c2jShape" : "__integer",
           "deprecated" : false,
-          "documentation" : "<p>The number of Kafka broker nodes in the cluster.</p>",
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withNumberOfBrokerNodes",
-          "getterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@return The number of Kafka broker nodes in the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@return <p>The number of broker nodes in the cluster.</p>*/",
           "getterMethodName" : "getNumberOfBrokerNodes",
           "getterModel" : {
             "returnType" : "Integer",
@@ -4520,7 +6041,7 @@
           "marshallingType" : "INTEGER",
           "name" : "NumberOfBrokerNodes",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>*/",
           "setterMethodName" : "setNumberOfBrokerNodes",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4534,13 +6055,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Integer",
             "variableName" : "numberOfBrokerNodes",
             "variableType" : "Integer",
-            "documentation" : "<p>The number of Kafka broker nodes in the cluster.</p>",
+            "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
             "simpleType" : "Integer",
             "variableSetterType" : "Integer"
           },
@@ -4550,11 +6071,11 @@
           "c2jName" : "State",
           "c2jShape" : "ClusterState",
           "deprecated" : false,
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
           "enumType" : "ClusterState",
-          "fluentSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
           "fluentSetterMethodName" : "withState",
-          "getterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
+          "getterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@return <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
           "getterMethodName" : "getState",
           "getterModel" : {
             "returnType" : "String",
@@ -4588,7 +6109,7 @@
           "marshallingType" : "STRING",
           "name" : "State",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
+          "setterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
           "setterMethodName" : "setState",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4602,30 +6123,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "varargSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "state",
             "variableType" : "String",
-            "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+            "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "ZookeeperConnectString" : {
-          "c2jName" : "ZookeeperConnectString",
-          "c2jShape" : "__string",
+        "Tags" : {
+          "c2jName" : "Tags",
+          "c2jShape" : "__mapOf__string",
           "deprecated" : false,
-          "documentation" : "<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>",
+          "documentation" : "\n            <p>Tags attached to the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@param zookeeperConnectString The connection string to use to connect to the Apache ZooKeeper cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withZookeeperConnectString",
-          "getterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@return The connection string to use to connect to the Apache ZooKeeper cluster.*/",
-          "getterMethodName" : "getZookeeperConnectString",
+          "fluentSetterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@param tags <p>Tags attached to the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@return <p>Tags attached to the cluster.</p>*/",
+          "getterMethodName" : "getTags",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "java.util.Map<String,String>",
             "documentation" : null
           },
           "http" : {
@@ -4638,11 +6159,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "zookeeperConnectString",
+            "marshallLocationName" : "tags",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "zookeeperConnectString",
+            "unmarshallLocationName" : "tags",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -4650,13 +6171,163 @@
           "jsonValue" : false,
           "list" : false,
           "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getValue",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "value",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "value",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
+          },
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@param tags <p>Tags attached to the cluster.</p>*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Tags attached to the cluster.</p>\n         \n@param tags <p>Tags attached to the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "\n            <p>Tags attached to the cluster.</p>\n         ",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ZookeeperConnectString" : {
+          "c2jName" : "ZookeeperConnectString",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@param zookeeperConnectString <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withZookeeperConnectString",
+          "getterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@return <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>*/",
+          "getterMethodName" : "getZookeeperConnectString",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "zookeeperConnectString",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "zookeeperConnectString",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
           "name" : "ZookeeperConnectString",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@param zookeeperConnectString The connection string to use to connect to the Apache ZooKeeper cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@param zookeeperConnectString <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>*/",
           "setterMethodName" : "setZookeeperConnectString",
           "setterModel" : {
             "timestampFormat" : null,
@@ -4670,13 +6341,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@param zookeeperConnectString The connection string to use to connect to the Apache ZooKeeper cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         \n@param zookeeperConnectString <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "zookeeperConnectString",
             "variableType" : "String",
-            "documentation" : "<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>",
+            "documentation" : "\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -4704,61 +6375,8 @@
       },
       "wrapper" : false
     },
-    "ClusterState" : {
-      "c2jName" : "ClusterState",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>The state of a Kafka cluster.</p>",
-      "enums" : [ {
-        "name" : "ACTIVE",
-        "value" : "ACTIVE"
-      }, {
-        "name" : "CREATING",
-        "value" : "CREATING"
-      }, {
-        "name" : "DELETING",
-        "value" : "DELETING"
-      }, {
-        "name" : "FAILED",
-        "value" : "FAILED"
-      } ],
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ClusterState",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ClusterState",
-        "variableName" : "clusterState",
-        "variableType" : "ClusterState",
-        "documentation" : null,
-        "simpleType" : "ClusterState",
-        "variableSetterType" : "ClusterState"
-      },
-      "wrapper" : false
-    },
-    "Configuration" : {
-      "c2jName" : "Configuration",
+    "ClusterOperationInfo" : {
+      "c2jName" : "ClusterOperationInfo",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -4766,7 +6384,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Represents an MSK Configuration.</p>",
+      "documentation" : "\n            <p>Returns information about a cluster operation.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -4776,15 +6394,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "Arn",
+        "c2jName" : "ClientRequestId",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+        "documentation" : "\n            <p>The ID of the API request that triggered this operation.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
-        "getterMethodName" : "getArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@param clientRequestId <p>The ID of the API request that triggered this operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClientRequestId",
+        "getterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@return <p>The ID of the API request that triggered this operation.</p>*/",
+        "getterMethodName" : "getClientRequestId",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -4799,11 +6417,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "arn",
+          "marshallLocationName" : "clientRequestId",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "arn",
+          "unmarshallLocationName" : "clientRequestId",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -4815,14 +6433,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Arn",
+        "name" : "ClientRequestId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
-        "setterMethodName" : "setArn",
+        "setterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@param clientRequestId <p>The ID of the API request that triggered this operation.</p>*/",
+        "setterMethodName" : "setClientRequestId",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "arn",
+          "variableName" : "clientRequestId",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -4831,29 +6449,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@param clientRequestId <p>The ID of the API request that triggered this operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "arn",
+          "variableName" : "clientRequestId",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+          "documentation" : "\n            <p>The ID of the API request that triggered this operation.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "CreationTime",
-        "c2jShape" : "__timestampIso8601",
+        "c2jName" : "ClusterArn",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The time when the configuration was created.</p>",
+        "documentation" : "\n            <p>ARN of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCreationTime",
-        "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
-        "getterMethodName" : "getCreationTime",
+        "fluentSetterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@param clusterArn <p>ARN of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@return <p>ARN of the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
-          "returnType" : "java.util.Date",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -4866,11 +6484,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "creationTime",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "creationTime",
+          "unmarshallLocationName" : "clusterArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -4880,47 +6498,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "java.util.Date",
-        "marshallingType" : "DATE",
-        "name" : "CreationTime",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
-        "setterMethodName" : "setCreationTime",
+        "setterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@param clusterArn <p>ARN of the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@param clusterArn <p>ARN of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
-          "timestampFormat" : "iso8601",
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
-          "documentation" : "<p>The time when the configuration was created.</p>",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>ARN of the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "Description",
-        "c2jShape" : "__string",
+        "c2jName" : "CreationTime",
+        "c2jShape" : "__timestampIso8601",
         "deprecated" : false,
-        "documentation" : "<p>The description of the configuration.</p>",
+        "documentation" : "\n            <p>The time that the operation was created.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withDescription",
-        "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
-        "getterMethodName" : "getDescription",
+        "fluentSetterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@param creationTime <p>The time that the operation was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@return <p>The time that the operation was created.</p>*/",
+        "getterMethodName" : "getCreationTime",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "java.util.Date",
           "documentation" : null
         },
         "http" : {
@@ -4933,11 +6551,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "description",
+          "marshallLocationName" : "creationTime",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "description",
+          "unmarshallLocationName" : "creationTime",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -4947,47 +6565,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Description",
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
-        "setterMethodName" : "setDescription",
+        "setterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@param creationTime <p>The time that the operation was created.</p>*/",
+        "setterMethodName" : "setCreationTime",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "description",
-          "variableType" : "String",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@param creationTime <p>The time that the operation was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "description",
-          "variableType" : "String",
-          "documentation" : "<p>The description of the configuration.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "timestampFormat" : "iso8601",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "\n            <p>The time that the operation was created.</p>\n         ",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "KafkaVersions",
-        "c2jShape" : "__listOf__string",
+        "c2jName" : "EndTime",
+        "c2jShape" : "__timestampIso8601",
         "deprecated" : false,
-        "documentation" : "<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>",
+        "documentation" : "\n            <p>The time at which the operation finished.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@param kafkaVersions An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withKafkaVersions",
-        "getterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@return An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.*/",
-        "getterMethodName" : "getKafkaVersions",
+        "fluentSetterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@param endTime <p>The time at which the operation finished.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEndTime",
+        "getterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@return <p>The time at which the operation finished.</p>*/",
+        "getterMethodName" : "getEndTime",
         "getterModel" : {
-          "returnType" : "java.util.List<String>",
+          "returnType" : "java.util.Date",
           "documentation" : null
         },
         "http" : {
@@ -5000,143 +6618,61 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "kafkaVersions",
+          "marshallLocationName" : "endTime",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "kafkaVersions",
+          "unmarshallLocationName" : "endTime",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "__string",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "String",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "String",
-            "marshallingType" : "STRING",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "member",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : true,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "member",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "String",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : true,
-          "simpleType" : "String",
-          "templateImplType" : "java.util.ArrayList<String>",
-          "templateType" : "java.util.List<String>"
-        },
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "KafkaVersions",
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "EndTime",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@param kafkaVersions An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.*/",
-        "setterMethodName" : "setKafkaVersions",
+        "setterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@param endTime <p>The time at which the operation finished.</p>*/",
+        "setterMethodName" : "setEndTime",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "kafkaVersions",
-          "variableType" : "java.util.List<String>",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "endTime",
+          "variableType" : "java.util.Date",
           "documentation" : "",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@param endTime <p>The time at which the operation finished.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "kafkaVersions",
-          "variableType" : "java.util.List<String>",
-          "documentation" : "<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
+          "timestampFormat" : "iso8601",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "endTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "\n            <p>The time at which the operation finished.</p>\n         ",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "LatestRevision",
-        "c2jShape" : "ConfigurationRevision",
+        "c2jName" : "ErrorInfo",
+        "c2jShape" : "ErrorInfo",
         "deprecated" : false,
-        "documentation" : "<p>Latest revision of the configuration.</p>",
+        "documentation" : "\n            <p>Describes the error if the operation fails.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withLatestRevision",
-        "getterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@return Latest revision of the configuration.*/",
-        "getterMethodName" : "getLatestRevision",
+        "fluentSetterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@param errorInfo <p>Describes the error if the operation fails.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withErrorInfo",
+        "getterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@return <p>Describes the error if the operation fails.</p>*/",
+        "getterMethodName" : "getErrorInfo",
         "getterModel" : {
-          "returnType" : "ConfigurationRevision",
+          "returnType" : "ErrorInfo",
           "documentation" : null
         },
         "http" : {
@@ -5149,11 +6685,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "latestRevision",
+          "marshallLocationName" : "errorInfo",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "latestRevision",
+          "unmarshallLocationName" : "errorInfo",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -5165,43 +6701,43 @@
         "mapModel" : null,
         "marshallingTargetClass" : "StructuredPojo",
         "marshallingType" : "STRUCTURED",
-        "name" : "LatestRevision",
+        "name" : "ErrorInfo",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.*/",
-        "setterMethodName" : "setLatestRevision",
+        "setterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@param errorInfo <p>Describes the error if the operation fails.</p>*/",
+        "setterMethodName" : "setErrorInfo",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationRevision",
-          "variableName" : "latestRevision",
-          "variableType" : "ConfigurationRevision",
+          "variableDeclarationType" : "ErrorInfo",
+          "variableName" : "errorInfo",
+          "variableType" : "ErrorInfo",
           "documentation" : "",
-          "simpleType" : "ConfigurationRevision",
-          "variableSetterType" : "ConfigurationRevision"
+          "simpleType" : "ErrorInfo",
+          "variableSetterType" : "ErrorInfo"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@param errorInfo <p>Describes the error if the operation fails.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationRevision",
-          "variableName" : "latestRevision",
-          "variableType" : "ConfigurationRevision",
-          "documentation" : "<p>Latest revision of the configuration.</p>",
-          "simpleType" : "ConfigurationRevision",
-          "variableSetterType" : "ConfigurationRevision"
+          "variableDeclarationType" : "ErrorInfo",
+          "variableName" : "errorInfo",
+          "variableType" : "ErrorInfo",
+          "documentation" : "\n            <p>Describes the error if the operation fails.</p>\n         ",
+          "simpleType" : "ErrorInfo",
+          "variableSetterType" : "ErrorInfo"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "Name",
+        "c2jName" : "OperationArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The name of the configuration.</p>",
+        "documentation" : "\n            <p>ARN of the cluster operation.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withName",
-        "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-        "getterMethodName" : "getName",
+        "fluentSetterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@param operationArn <p>ARN of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withOperationArn",
+        "getterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@return <p>ARN of the cluster operation.</p>*/",
+        "getterMethodName" : "getOperationArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -5216,11 +6752,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "name",
+          "marshallLocationName" : "operationArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "name",
+          "unmarshallLocationName" : "operationArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -5232,14 +6768,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Name",
+        "name" : "OperationArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-        "setterMethodName" : "setName",
+        "setterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@param operationArn <p>ARN of the cluster operation.</p>*/",
+        "setterMethodName" : "setOperationArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "name",
+          "variableName" : "operationArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -5248,99 +6784,299 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@param operationArn <p>ARN of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "name",
+          "variableName" : "operationArn",
           "variableType" : "String",
-          "documentation" : "<p>The name of the configuration.</p>",
+          "documentation" : "\n            <p>ARN of the cluster operation.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "Arn" : {
-          "c2jName" : "Arn",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
-          "getterMethodName" : "getArn",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "arn",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "arn",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Arn",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
-          "setterMethodName" : "setArn",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "arn",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "arn",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "OperationState",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>State of the cluster operation.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@param operationState <p>State of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withOperationState",
+        "getterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@return <p>State of the cluster operation.</p>*/",
+        "getterMethodName" : "getOperationState",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
         },
-        "CreationTime" : {
-          "c2jName" : "CreationTime",
-          "c2jShape" : "__timestampIso8601",
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "operationState",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "operationState",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "OperationState",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@param operationState <p>State of the cluster operation.</p>*/",
+        "setterMethodName" : "setOperationState",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "operationState",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@param operationState <p>State of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "operationState",
+          "variableType" : "String",
+          "documentation" : "\n            <p>State of the cluster operation.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "OperationType",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Type of the cluster operation.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@param operationType <p>Type of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withOperationType",
+        "getterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@return <p>Type of the cluster operation.</p>*/",
+        "getterMethodName" : "getOperationType",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "operationType",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "operationType",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "OperationType",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@param operationType <p>Type of the cluster operation.</p>*/",
+        "setterMethodName" : "setOperationType",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "operationType",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@param operationType <p>Type of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "operationType",
+          "variableType" : "String",
+          "documentation" : "\n            <p>Type of the cluster operation.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "SourceClusterInfo",
+        "c2jShape" : "MutableClusterInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@param sourceClusterInfo <p>Information about cluster attributes before a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSourceClusterInfo",
+        "getterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@return <p>Information about cluster attributes before a cluster is updated.</p>*/",
+        "getterMethodName" : "getSourceClusterInfo",
+        "getterModel" : {
+          "returnType" : "MutableClusterInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "sourceClusterInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "sourceClusterInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "SourceClusterInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@param sourceClusterInfo <p>Information about cluster attributes before a cluster is updated.</p>*/",
+        "setterMethodName" : "setSourceClusterInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "MutableClusterInfo",
+          "variableName" : "sourceClusterInfo",
+          "variableType" : "MutableClusterInfo",
+          "documentation" : "",
+          "simpleType" : "MutableClusterInfo",
+          "variableSetterType" : "MutableClusterInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@param sourceClusterInfo <p>Information about cluster attributes before a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "MutableClusterInfo",
+          "variableName" : "sourceClusterInfo",
+          "variableType" : "MutableClusterInfo",
+          "documentation" : "\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         ",
+          "simpleType" : "MutableClusterInfo",
+          "variableSetterType" : "MutableClusterInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "TargetClusterInfo",
+        "c2jShape" : "MutableClusterInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@param targetClusterInfo <p>Information about cluster attributes after a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTargetClusterInfo",
+        "getterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@return <p>Information about cluster attributes after a cluster is updated.</p>*/",
+        "getterMethodName" : "getTargetClusterInfo",
+        "getterModel" : {
+          "returnType" : "MutableClusterInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "targetClusterInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "targetClusterInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "TargetClusterInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@param targetClusterInfo <p>Information about cluster attributes after a cluster is updated.</p>*/",
+        "setterMethodName" : "setTargetClusterInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "MutableClusterInfo",
+          "variableName" : "targetClusterInfo",
+          "variableType" : "MutableClusterInfo",
+          "documentation" : "",
+          "simpleType" : "MutableClusterInfo",
+          "variableSetterType" : "MutableClusterInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@param targetClusterInfo <p>Information about cluster attributes after a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "MutableClusterInfo",
+          "variableName" : "targetClusterInfo",
+          "variableType" : "MutableClusterInfo",
+          "documentation" : "\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         ",
+          "simpleType" : "MutableClusterInfo",
+          "variableSetterType" : "MutableClusterInfo"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClientRequestId" : {
+          "c2jName" : "ClientRequestId",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The time when the configuration was created.</p>",
+          "documentation" : "\n            <p>The ID of the API request that triggered this operation.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withCreationTime",
-          "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
-          "getterMethodName" : "getCreationTime",
+          "fluentSetterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@param clientRequestId <p>The ID of the API request that triggered this operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClientRequestId",
+          "getterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@return <p>The ID of the API request that triggered this operation.</p>*/",
+          "getterMethodName" : "getClientRequestId",
           "getterModel" : {
-            "returnType" : "java.util.Date",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -5353,11 +7089,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "creationTime",
+            "marshallLocationName" : "clientRequestId",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "creationTime",
+            "unmarshallLocationName" : "clientRequestId",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -5367,46 +7103,46 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "java.util.Date",
-          "marshallingType" : "DATE",
-          "name" : "CreationTime",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClientRequestId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
-          "setterMethodName" : "setCreationTime",
+          "setterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@param clientRequestId <p>The ID of the API request that triggered this operation.</p>*/",
+          "setterMethodName" : "setClientRequestId",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Date",
-            "variableName" : "creationTime",
-            "variableType" : "java.util.Date",
+            "variableDeclarationType" : "String",
+            "variableName" : "clientRequestId",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "Date",
-            "variableSetterType" : "java.util.Date"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The ID of the API request that triggered this operation.</p>\n         \n@param clientRequestId <p>The ID of the API request that triggered this operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
-            "timestampFormat" : "iso8601",
-            "variableDeclarationType" : "java.util.Date",
-            "variableName" : "creationTime",
-            "variableType" : "java.util.Date",
-            "documentation" : "<p>The time when the configuration was created.</p>",
-            "simpleType" : "Date",
-            "variableSetterType" : "java.util.Date"
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clientRequestId",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The ID of the API request that triggered this operation.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Description" : {
-          "c2jName" : "Description",
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>ARN of the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withDescription",
-          "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
-          "getterMethodName" : "getDescription",
+          "fluentSetterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@param clusterArn <p>ARN of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@return <p>ARN of the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -5421,11 +7157,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "description",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "description",
+            "unmarshallLocationName" : "clusterArn",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -5437,14 +7173,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "Description",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
-          "setterMethodName" : "setDescription",
+          "setterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@param clusterArn <p>ARN of the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "description",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -5453,30 +7189,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>ARN of the cluster.</p>\n         \n@param clusterArn <p>ARN of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "description",
+            "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The description of the configuration.</p>",
+            "documentation" : "\n            <p>ARN of the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "KafkaVersions" : {
-          "c2jName" : "KafkaVersions",
-          "c2jShape" : "__listOf__string",
+        "CreationTime" : {
+          "c2jName" : "CreationTime",
+          "c2jShape" : "__timestampIso8601",
           "deprecated" : false,
-          "documentation" : "<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>",
+          "documentation" : "\n            <p>The time that the operation was created.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@param kafkaVersions An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withKafkaVersions",
-          "getterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@return An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.*/",
-          "getterMethodName" : "getKafkaVersions",
+          "fluentSetterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@param creationTime <p>The time that the operation was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@return <p>The time that the operation was created.</p>*/",
+          "getterMethodName" : "getCreationTime",
           "getterModel" : {
-            "returnType" : "java.util.List<String>",
+            "returnType" : "java.util.Date",
             "documentation" : null
           },
           "http" : {
@@ -5489,144 +7225,130 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "kafkaVersions",
+            "marshallLocationName" : "creationTime",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "kafkaVersions",
+            "unmarshallLocationName" : "creationTime",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "__string",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "String",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "String",
-              "marshallingType" : "STRING",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : true,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "String",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : true,
-            "simpleType" : "String",
-            "templateImplType" : "java.util.ArrayList<String>",
-            "templateType" : "java.util.List<String>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "KafkaVersions",
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@param kafkaVersions An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.*/",
-          "setterMethodName" : "setKafkaVersions",
+          "setterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@param creationTime <p>The time that the operation was created.</p>*/",
+          "setterMethodName" : "setCreationTime",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "kafkaVersions",
-            "variableType" : "java.util.List<String>",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
             "documentation" : "",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The time that the operation was created.</p>\n         \n@param creationTime <p>The time that the operation was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
+            "timestampFormat" : "iso8601",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "\n            <p>The time that the operation was created.</p>\n         ",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "EndTime" : {
+          "c2jName" : "EndTime",
+          "c2jShape" : "__timestampIso8601",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The time at which the operation finished.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@param endTime <p>The time at which the operation finished.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEndTime",
+          "getterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@return <p>The time at which the operation finished.</p>*/",
+          "getterMethodName" : "getEndTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "endTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "endTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "EndTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@param endTime <p>The time at which the operation finished.</p>*/",
+          "setterMethodName" : "setEndTime",
+          "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "kafkaVersions",
-            "variableType" : "java.util.List<String>",
-            "documentation" : "<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "endTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The time at which the operation finished.</p>\n         \n@param endTime <p>The time at which the operation finished.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "iso8601",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "endTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "\n            <p>The time at which the operation finished.</p>\n         ",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
           },
           "xmlNameSpaceUri" : null
         },
-        "LatestRevision" : {
-          "c2jName" : "LatestRevision",
-          "c2jShape" : "ConfigurationRevision",
+        "ErrorInfo" : {
+          "c2jName" : "ErrorInfo",
+          "c2jShape" : "ErrorInfo",
           "deprecated" : false,
-          "documentation" : "<p>Latest revision of the configuration.</p>",
+          "documentation" : "\n            <p>Describes the error if the operation fails.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withLatestRevision",
-          "getterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@return Latest revision of the configuration.*/",
-          "getterMethodName" : "getLatestRevision",
+          "fluentSetterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@param errorInfo <p>Describes the error if the operation fails.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withErrorInfo",
+          "getterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@return <p>Describes the error if the operation fails.</p>*/",
+          "getterMethodName" : "getErrorInfo",
           "getterModel" : {
-            "returnType" : "ConfigurationRevision",
+            "returnType" : "ErrorInfo",
             "documentation" : null
           },
           "http" : {
@@ -5639,11 +7361,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "latestRevision",
+            "marshallLocationName" : "errorInfo",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "latestRevision",
+            "unmarshallLocationName" : "errorInfo",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -5655,44 +7377,44 @@
           "mapModel" : null,
           "marshallingTargetClass" : "StructuredPojo",
           "marshallingType" : "STRUCTURED",
-          "name" : "LatestRevision",
+          "name" : "ErrorInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.*/",
-          "setterMethodName" : "setLatestRevision",
+          "setterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@param errorInfo <p>Describes the error if the operation fails.</p>*/",
+          "setterMethodName" : "setErrorInfo",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationRevision",
-            "variableName" : "latestRevision",
-            "variableType" : "ConfigurationRevision",
+            "variableDeclarationType" : "ErrorInfo",
+            "variableName" : "errorInfo",
+            "variableType" : "ErrorInfo",
             "documentation" : "",
-            "simpleType" : "ConfigurationRevision",
-            "variableSetterType" : "ConfigurationRevision"
+            "simpleType" : "ErrorInfo",
+            "variableSetterType" : "ErrorInfo"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Describes the error if the operation fails.</p>\n         \n@param errorInfo <p>Describes the error if the operation fails.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationRevision",
-            "variableName" : "latestRevision",
-            "variableType" : "ConfigurationRevision",
-            "documentation" : "<p>Latest revision of the configuration.</p>",
-            "simpleType" : "ConfigurationRevision",
-            "variableSetterType" : "ConfigurationRevision"
+            "variableDeclarationType" : "ErrorInfo",
+            "variableName" : "errorInfo",
+            "variableType" : "ErrorInfo",
+            "documentation" : "\n            <p>Describes the error if the operation fails.</p>\n         ",
+            "simpleType" : "ErrorInfo",
+            "variableSetterType" : "ErrorInfo"
           },
           "xmlNameSpaceUri" : null
         },
-        "Name" : {
-          "c2jName" : "Name",
+        "OperationArn" : {
+          "c2jName" : "OperationArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The name of the configuration.</p>",
+          "documentation" : "\n            <p>ARN of the cluster operation.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withName",
-          "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-          "getterMethodName" : "getName",
+          "fluentSetterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@param operationArn <p>ARN of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withOperationArn",
+          "getterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@return <p>ARN of the cluster operation.</p>*/",
+          "getterMethodName" : "getOperationArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -5707,11 +7429,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "name",
+            "marshallLocationName" : "operationArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "name",
+            "unmarshallLocationName" : "operationArn",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -5723,14 +7445,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "Name",
+          "name" : "OperationArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-          "setterMethodName" : "setName",
+          "setterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@param operationArn <p>ARN of the cluster operation.</p>*/",
+          "setterMethodName" : "setOperationArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "name",
+            "variableName" : "operationArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -5739,204 +7461,28 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>ARN of the cluster operation.</p>\n         \n@param operationArn <p>ARN of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "name",
+            "variableName" : "operationArn",
             "variableType" : "String",
-            "documentation" : "<p>The name of the configuration.</p>",
+            "documentation" : "\n            <p>ARN of the cluster operation.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "Description", "LatestRevision", "CreationTime", "KafkaVersions", "Arn", "Name" ],
-      "shapeName" : "Configuration",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "Configuration",
-        "variableName" : "configuration",
-        "variableType" : "Configuration",
-        "documentation" : null,
-        "simpleType" : "Configuration",
-        "variableSetterType" : "Configuration"
-      },
-      "wrapper" : false
-    },
-    "ConfigurationInfo" : {
-      "c2jName" : "ConfigurationInfo",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Specifies the Kafka configuration to use for the brokers.</p>",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "Arn",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>ARN of the configuration to use.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@param arn ARN of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@return ARN of the configuration to use.*/",
-        "getterMethodName" : "getArn",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
         },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "arn",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "arn",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Arn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@param arn ARN of the configuration to use.*/",
-        "setterMethodName" : "setArn",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "arn",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@param arn ARN of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "arn",
-          "variableType" : "String",
-          "documentation" : "<p>ARN of the configuration to use.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "Revision",
-        "c2jShape" : "__long",
-        "deprecated" : false,
-        "documentation" : "<p>The revision of the configuration to use.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param revision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withRevision",
-        "getterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@return The revision of the configuration to use.*/",
-        "getterMethodName" : "getRevision",
-        "getterModel" : {
-          "returnType" : "Long",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "revision",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "revision",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Long",
-        "marshallingType" : "LONG",
-        "name" : "Revision",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param revision The revision of the configuration to use.*/",
-        "setterMethodName" : "setRevision",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param revision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "<p>The revision of the configuration to use.</p>",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "Arn" : {
-          "c2jName" : "Arn",
+        "OperationState" : {
+          "c2jName" : "OperationState",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>ARN of the configuration to use.</p>",
+          "documentation" : "\n            <p>State of the cluster operation.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@param arn ARN of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@return ARN of the configuration to use.*/",
-          "getterMethodName" : "getArn",
+          "fluentSetterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@param operationState <p>State of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withOperationState",
+          "getterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@return <p>State of the cluster operation.</p>*/",
+          "getterMethodName" : "getOperationState",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -5951,11 +7497,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "arn",
+            "marshallLocationName" : "operationState",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "arn",
+            "unmarshallLocationName" : "operationState",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -5967,14 +7513,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "Arn",
+          "name" : "OperationState",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@param arn ARN of the configuration to use.*/",
-          "setterMethodName" : "setArn",
+          "setterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@param operationState <p>State of the cluster operation.</p>*/",
+          "setterMethodName" : "setOperationState",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "arn",
+            "variableName" : "operationState",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -5983,30 +7529,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>ARN of the configuration to use.</p>\n@param arn ARN of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>State of the cluster operation.</p>\n         \n@param operationState <p>State of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "arn",
+            "variableName" : "operationState",
             "variableType" : "String",
-            "documentation" : "<p>ARN of the configuration to use.</p>",
+            "documentation" : "\n            <p>State of the cluster operation.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Revision" : {
-          "c2jName" : "Revision",
-          "c2jShape" : "__long",
+        "OperationType" : {
+          "c2jName" : "OperationType",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The revision of the configuration to use.</p>",
+          "documentation" : "\n            <p>Type of the cluster operation.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param revision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withRevision",
-          "getterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@return The revision of the configuration to use.*/",
-          "getterMethodName" : "getRevision",
+          "fluentSetterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@param operationType <p>Type of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withOperationType",
+          "getterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@return <p>Type of the cluster operation.</p>*/",
+          "getterMethodName" : "getOperationType",
           "getterModel" : {
-            "returnType" : "Long",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -6019,11 +7565,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "revision",
+            "marshallLocationName" : "operationType",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "revision",
+            "unmarshallLocationName" : "operationType",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -6033,41 +7579,177 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "Long",
-          "marshallingType" : "LONG",
-          "name" : "Revision",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "OperationType",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param revision The revision of the configuration to use.*/",
-          "setterMethodName" : "setRevision",
+          "setterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@param operationType <p>Type of the cluster operation.</p>*/",
+          "setterMethodName" : "setOperationType",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
+            "variableDeclarationType" : "String",
+            "variableName" : "operationType",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The revision of the configuration to use.</p>\n@param revision The revision of the configuration to use.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Type of the cluster operation.</p>\n         \n@param operationType <p>Type of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
-            "documentation" : "<p>The revision of the configuration to use.</p>",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
+            "variableDeclarationType" : "String",
+            "variableName" : "operationType",
+            "variableType" : "String",
+            "documentation" : "\n            <p>Type of the cluster operation.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SourceClusterInfo" : {
+          "c2jName" : "SourceClusterInfo",
+          "c2jShape" : "MutableClusterInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@param sourceClusterInfo <p>Information about cluster attributes before a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSourceClusterInfo",
+          "getterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@return <p>Information about cluster attributes before a cluster is updated.</p>*/",
+          "getterMethodName" : "getSourceClusterInfo",
+          "getterModel" : {
+            "returnType" : "MutableClusterInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sourceClusterInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sourceClusterInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "SourceClusterInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@param sourceClusterInfo <p>Information about cluster attributes before a cluster is updated.</p>*/",
+          "setterMethodName" : "setSourceClusterInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "MutableClusterInfo",
+            "variableName" : "sourceClusterInfo",
+            "variableType" : "MutableClusterInfo",
+            "documentation" : "",
+            "simpleType" : "MutableClusterInfo",
+            "variableSetterType" : "MutableClusterInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         \n@param sourceClusterInfo <p>Information about cluster attributes before a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "MutableClusterInfo",
+            "variableName" : "sourceClusterInfo",
+            "variableType" : "MutableClusterInfo",
+            "documentation" : "\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         ",
+            "simpleType" : "MutableClusterInfo",
+            "variableSetterType" : "MutableClusterInfo"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TargetClusterInfo" : {
+          "c2jName" : "TargetClusterInfo",
+          "c2jShape" : "MutableClusterInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@param targetClusterInfo <p>Information about cluster attributes after a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTargetClusterInfo",
+          "getterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@return <p>Information about cluster attributes after a cluster is updated.</p>*/",
+          "getterMethodName" : "getTargetClusterInfo",
+          "getterModel" : {
+            "returnType" : "MutableClusterInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "targetClusterInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "targetClusterInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "TargetClusterInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@param targetClusterInfo <p>Information about cluster attributes after a cluster is updated.</p>*/",
+          "setterMethodName" : "setTargetClusterInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "MutableClusterInfo",
+            "variableName" : "targetClusterInfo",
+            "variableType" : "MutableClusterInfo",
+            "documentation" : "",
+            "simpleType" : "MutableClusterInfo",
+            "variableSetterType" : "MutableClusterInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         \n@param targetClusterInfo <p>Information about cluster attributes after a cluster is updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "MutableClusterInfo",
+            "variableName" : "targetClusterInfo",
+            "variableType" : "MutableClusterInfo",
+            "documentation" : "\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         ",
+            "simpleType" : "MutableClusterInfo",
+            "variableSetterType" : "MutableClusterInfo"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "Revision", "Arn" ],
-      "shapeName" : "ConfigurationInfo",
+      "required" : null,
+      "shapeName" : "ClusterOperationInfo",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -6076,17 +7758,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ConfigurationInfo",
-        "variableName" : "configurationInfo",
-        "variableType" : "ConfigurationInfo",
+        "variableDeclarationType" : "ClusterOperationInfo",
+        "variableName" : "clusterOperationInfo",
+        "variableType" : "ClusterOperationInfo",
         "documentation" : null,
-        "simpleType" : "ConfigurationInfo",
-        "variableSetterType" : "ConfigurationInfo"
+        "simpleType" : "ClusterOperationInfo",
+        "variableSetterType" : "ClusterOperationInfo"
       },
       "wrapper" : false
     },
-    "ConfigurationRevision" : {
-      "c2jName" : "ConfigurationRevision",
+    "ClusterState" : {
+      "c2jName" : "ClusterState",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -6094,24 +7776,147 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Describes a configuration revision.</p>",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
+      "documentation" : "\n            <p>The state of a Kafka cluster.</p>\n         ",
+      "enums" : [ {
+        "name" : "ACTIVE",
+        "value" : "ACTIVE"
+      }, {
+        "name" : "CREATING",
+        "value" : "CREATING"
+      }, {
+        "name" : "UPDATING",
+        "value" : "UPDATING"
+      }, {
+        "name" : "DELETING",
+        "value" : "DELETING"
+      }, {
+        "name" : "FAILED",
+        "value" : "FAILED"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ClusterState",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ClusterState",
+        "variableName" : "clusterState",
+        "variableType" : "ClusterState",
+        "documentation" : null,
+        "simpleType" : "ClusterState",
+        "variableSetterType" : "ClusterState"
+      },
+      "wrapper" : false
+    },
+    "Configuration" : {
+      "c2jName" : "Configuration",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Represents an MSK Configuration.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
+        "c2jName" : "Arn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+        "getterMethodName" : "getArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "arn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "arn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Arn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+        "setterMethodName" : "setArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "arn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "arn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
         "c2jName" : "CreationTime",
         "c2jShape" : "__timestampIso8601",
         "deprecated" : false,
-        "documentation" : "<p>The time when the configuration revision was created.</p>",
+        "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@param creationTime The time when the configuration revision was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withCreationTime",
-        "getterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@return The time when the configuration revision was created.*/",
+        "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
         "getterMethodName" : "getCreationTime",
         "getterModel" : {
           "returnType" : "java.util.Date",
@@ -6145,7 +7950,7 @@
         "marshallingType" : "DATE",
         "name" : "CreationTime",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@param creationTime The time when the configuration revision was created.*/",
+        "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
         "setterMethodName" : "setCreationTime",
         "setterModel" : {
           "timestampFormat" : null,
@@ -6159,13 +7964,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@param creationTime The time when the configuration revision was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : "iso8601",
           "variableDeclarationType" : "java.util.Date",
           "variableName" : "creationTime",
           "variableType" : "java.util.Date",
-          "documentation" : "<p>The time when the configuration revision was created.</p>",
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
           "simpleType" : "Date",
           "variableSetterType" : "java.util.Date"
         },
@@ -6174,11 +7979,11 @@
         "c2jName" : "Description",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The description of the configuration revision.</p>",
+        "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@param description The description of the configuration revision.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withDescription",
-        "getterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@return The description of the configuration revision.*/",
+        "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
         "getterMethodName" : "getDescription",
         "getterModel" : {
           "returnType" : "String",
@@ -6212,7 +8017,7 @@
         "marshallingType" : "STRING",
         "name" : "Description",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@param description The description of the configuration revision.*/",
+        "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
         "setterMethodName" : "setDescription",
         "setterModel" : {
           "timestampFormat" : null,
@@ -6226,29 +8031,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@param description The description of the configuration revision.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "description",
           "variableType" : "String",
-          "documentation" : "<p>The description of the configuration revision.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "Revision",
-        "c2jShape" : "__long",
+        "c2jName" : "KafkaVersions",
+        "c2jShape" : "__listOf__string",
         "deprecated" : false,
-        "documentation" : "<p>The revision number.</p>",
+        "documentation" : "\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withRevision",
-        "getterDocumentation" : "/**<p>The revision number.</p>\n@return The revision number.*/",
-        "getterMethodName" : "getRevision",
+        "fluentSetterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n@param kafkaVersions <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKafkaVersions",
+        "getterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n@return <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>*/",
+        "getterMethodName" : "getKafkaVersions",
         "getterModel" : {
-          "returnType" : "Long",
+          "returnType" : "java.util.List<String>",
           "documentation" : null
         },
         "http" : {
@@ -6261,60 +8066,344 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "revision",
+          "marshallLocationName" : "kafkaVersions",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "revision",
+          "unmarshallLocationName" : "kafkaVersions",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Long",
-        "marshallingType" : "LONG",
-        "name" : "Revision",
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "KafkaVersions",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.*/",
-        "setterMethodName" : "setRevision",
+        "setterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n@param kafkaVersions <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>*/",
+        "setterMethodName" : "setKafkaVersions",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "kafkaVersions",
+          "variableType" : "java.util.List<String>",
           "documentation" : "",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "<p>The revision number.</p>",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "kafkaVersions",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "CreationTime" : {
-          "c2jName" : "CreationTime",
-          "c2jShape" : "__timestampIso8601",
-          "deprecated" : false,
-          "documentation" : "<p>The time when the configuration revision was created.</p>",
+      }, {
+        "c2jName" : "LatestRevision",
+        "c2jShape" : "ConfigurationRevision",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLatestRevision",
+        "getterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@return <p>Latest revision of the configuration.</p>*/",
+        "getterMethodName" : "getLatestRevision",
+        "getterModel" : {
+          "returnType" : "ConfigurationRevision",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "latestRevision",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "latestRevision",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "LatestRevision",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>*/",
+        "setterMethodName" : "setLatestRevision",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationRevision",
+          "variableName" : "latestRevision",
+          "variableType" : "ConfigurationRevision",
+          "documentation" : "",
+          "simpleType" : "ConfigurationRevision",
+          "variableSetterType" : "ConfigurationRevision"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationRevision",
+          "variableName" : "latestRevision",
+          "variableType" : "ConfigurationRevision",
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+          "simpleType" : "ConfigurationRevision",
+          "variableSetterType" : "ConfigurationRevision"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Name",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Arn" : {
+          "c2jName" : "Arn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@param creationTime The time when the configuration revision was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+          "getterMethodName" : "getArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "arn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "arn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Arn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+          "setterMethodName" : "setArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "CreationTime" : {
+          "c2jName" : "CreationTime",
+          "c2jShape" : "__timestampIso8601",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withCreationTime",
-          "getterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@return The time when the configuration revision was created.*/",
+          "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
           "getterMethodName" : "getCreationTime",
           "getterModel" : {
             "returnType" : "java.util.Date",
@@ -6348,7 +8437,7 @@
           "marshallingType" : "DATE",
           "name" : "CreationTime",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@param creationTime The time when the configuration revision was created.*/",
+          "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
           "setterMethodName" : "setCreationTime",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6362,13 +8451,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The time when the configuration revision was created.</p>\n@param creationTime The time when the configuration revision was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : "iso8601",
             "variableDeclarationType" : "java.util.Date",
             "variableName" : "creationTime",
             "variableType" : "java.util.Date",
-            "documentation" : "<p>The time when the configuration revision was created.</p>",
+            "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
             "simpleType" : "Date",
             "variableSetterType" : "java.util.Date"
           },
@@ -6378,11 +8467,11 @@
           "c2jName" : "Description",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The description of the configuration revision.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@param description The description of the configuration revision.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withDescription",
-          "getterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@return The description of the configuration revision.*/",
+          "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
           "getterMethodName" : "getDescription",
           "getterModel" : {
             "returnType" : "String",
@@ -6416,7 +8505,7 @@
           "marshallingType" : "STRING",
           "name" : "Description",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@param description The description of the configuration revision.*/",
+          "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
           "setterMethodName" : "setDescription",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6430,30 +8519,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The description of the configuration revision.</p>\n@param description The description of the configuration revision.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "description",
             "variableType" : "String",
-            "documentation" : "<p>The description of the configuration revision.</p>",
+            "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Revision" : {
-          "c2jName" : "Revision",
-          "c2jShape" : "__long",
+        "KafkaVersions" : {
+          "c2jName" : "KafkaVersions",
+          "c2jShape" : "__listOf__string",
           "deprecated" : false,
-          "documentation" : "<p>The revision number.</p>",
+          "documentation" : "\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withRevision",
-          "getterDocumentation" : "/**<p>The revision number.</p>\n@return The revision number.*/",
-          "getterMethodName" : "getRevision",
+          "fluentSetterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n@param kafkaVersions <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKafkaVersions",
+          "getterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n@return <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>*/",
+          "getterMethodName" : "getKafkaVersions",
           "getterModel" : {
-            "returnType" : "Long",
+            "returnType" : "java.util.List<String>",
             "documentation" : null
           },
           "http" : {
@@ -6466,171 +8555,144 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "revision",
+            "marshallLocationName" : "kafkaVersions",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "revision",
+            "unmarshallLocationName" : "kafkaVersions",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Long",
-          "marshallingType" : "LONG",
-          "name" : "Revision",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.*/",
-          "setterMethodName" : "setRevision",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
-            "documentation" : "",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
-            "documentation" : "<p>The revision number.</p>",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
-          },
-          "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "Revision", "CreationTime" ],
-      "shapeName" : "ConfigurationRevision",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ConfigurationRevision",
-        "variableName" : "configurationRevision",
-        "variableType" : "ConfigurationRevision",
-        "documentation" : null,
-        "simpleType" : "ConfigurationRevision",
-        "variableSetterType" : "ConfigurationRevision"
-      },
-      "wrapper" : false
-    },
-    "ConflictException" : {
-      "c2jName" : "ConflictException",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
-      "enums" : null,
-      "errorCode" : "ConflictException",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "InvalidParameter",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-        "getterMethodName" : "getInvalidParameter",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "invalidParameter",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "invalidParameter",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "InvalidParameter",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-        "setterMethodName" : "setInvalidParameter",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
-          "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "KafkaVersions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n@param kafkaVersions <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>*/",
+          "setterMethodName" : "setKafkaVersions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "kafkaVersions",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "kafkaVersions",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "InvalidParameter" : {
-          "c2jName" : "InvalidParameter",
-          "c2jShape" : "__string",
+        "LatestRevision" : {
+          "c2jName" : "LatestRevision",
+          "c2jShape" : "ConfigurationRevision",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-          "getterMethodName" : "getInvalidParameter",
+          "fluentSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLatestRevision",
+          "getterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@return <p>Latest revision of the configuration.</p>*/",
+          "getterMethodName" : "getLatestRevision",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "ConfigurationRevision",
             "documentation" : null
           },
           "http" : {
@@ -6643,11 +8705,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "invalidParameter",
+            "marshallLocationName" : "latestRevision",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "invalidParameter",
+            "unmarshallLocationName" : "latestRevision",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -6657,57 +8719,128 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "InvalidParameter",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "LatestRevision",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-          "setterMethodName" : "setInvalidParameter",
+          "setterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>*/",
+          "setterMethodName" : "setLatestRevision",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
-            "variableType" : "String",
+            "variableDeclarationType" : "ConfigurationRevision",
+            "variableName" : "latestRevision",
+            "variableType" : "ConfigurationRevision",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "ConfigurationRevision",
+            "variableSetterType" : "ConfigurationRevision"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
-            "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "ConfigurationRevision",
+            "variableName" : "latestRevision",
+            "variableType" : "ConfigurationRevision",
+            "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+            "simpleType" : "ConfigurationRevision",
+            "variableSetterType" : "ConfigurationRevision"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ConflictException",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ConflictException",
-        "variableName" : "conflictException",
-        "variableType" : "ConflictException",
-        "documentation" : null,
-        "simpleType" : "ConflictException",
-        "variableSetterType" : "ConflictException"
+        },
+        "Name" : {
+          "c2jName" : "Name",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "Description", "LatestRevision", "CreationTime", "KafkaVersions", "Arn", "Name" ],
+      "shapeName" : "Configuration",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Configuration",
+        "variableName" : "configuration",
+        "variableType" : "Configuration",
+        "documentation" : null,
+        "simpleType" : "Configuration",
+        "variableSetterType" : "Configuration"
       },
       "wrapper" : false
     },
-    "CreateClusterRequest" : {
-      "c2jName" : "CreateClusterRequest",
+    "ConfigurationInfo" : {
+      "c2jName" : "ConfigurationInfo",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -6715,7 +8848,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>Specifies the configuration to use for the brokers.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -6723,91 +8856,17 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "CreateCluster",
-        "locationName" : null,
-        "requestUri" : "/v1/clusters",
-        "target" : null,
-        "verb" : "POST",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "BrokerNodeGroupInfo",
-        "c2jShape" : "BrokerNodeGroupInfo",
-        "deprecated" : false,
-        "documentation" : "<p>Information about the broker nodes in the cluster.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@param brokerNodeGroupInfo Information about the broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
-        "getterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@return Information about the broker nodes in the cluster.*/",
-        "getterMethodName" : "getBrokerNodeGroupInfo",
-        "getterModel" : {
-          "returnType" : "BrokerNodeGroupInfo",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "brokerNodeGroupInfo",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "brokerNodeGroupInfo",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "BrokerNodeGroupInfo",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@param brokerNodeGroupInfo Information about the broker nodes in the cluster.*/",
-        "setterMethodName" : "setBrokerNodeGroupInfo",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerNodeGroupInfo",
-          "variableName" : "brokerNodeGroupInfo",
-          "variableType" : "BrokerNodeGroupInfo",
-          "documentation" : "",
-          "simpleType" : "BrokerNodeGroupInfo",
-          "variableSetterType" : "BrokerNodeGroupInfo"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@param brokerNodeGroupInfo Information about the broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerNodeGroupInfo",
-          "variableName" : "brokerNodeGroupInfo",
-          "variableType" : "BrokerNodeGroupInfo",
-          "documentation" : "<p>Information about the broker nodes in the cluster.</p>",
-          "simpleType" : "BrokerNodeGroupInfo",
-          "variableSetterType" : "BrokerNodeGroupInfo"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "ClusterName",
-        "c2jShape" : "__stringMin1Max64",
+        "c2jName" : "Arn",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The name of the cluster.</p>",
+        "documentation" : "\n            <p>ARN of the configuration to use.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterName",
-        "getterDocumentation" : "/**<p>The name of the cluster.</p>\n@return The name of the cluster.*/",
-        "getterMethodName" : "getClusterName",
+        "fluentSetterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@param arn <p>ARN of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArn",
+        "getterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@return <p>ARN of the configuration to use.</p>*/",
+        "getterMethodName" : "getArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -6822,11 +8881,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterName",
+          "marshallLocationName" : "arn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterName",
+          "unmarshallLocationName" : "arn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -6838,14 +8897,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ClusterName",
+        "name" : "Arn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.*/",
-        "setterMethodName" : "setClusterName",
+        "setterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@param arn <p>ARN of the configuration to use.</p>*/",
+        "setterMethodName" : "setArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterName",
+          "variableName" : "arn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -6854,29 +8913,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@param arn <p>ARN of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterName",
+          "variableName" : "arn",
           "variableType" : "String",
-          "documentation" : "<p>The name of the cluster.</p>",
+          "documentation" : "\n            <p>ARN of the configuration to use.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "ConfigurationInfo",
-        "c2jShape" : "ConfigurationInfo",
+        "c2jName" : "Revision",
+        "c2jShape" : "__long",
         "deprecated" : false,
-        "documentation" : "<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>",
+        "documentation" : "\n            <p>The revision of the configuration to use.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@param configurationInfo Comprises of the Configuration to be used on Kafka brokers in a cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withConfigurationInfo",
-        "getterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@return Comprises of the Configuration to be used on Kafka brokers in a cluster.*/",
-        "getterMethodName" : "getConfigurationInfo",
+        "fluentSetterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@param revision <p>The revision of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRevision",
+        "getterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@return <p>The revision of the configuration to use.</p>*/",
+        "getterMethodName" : "getRevision",
         "getterModel" : {
-          "returnType" : "ConfigurationInfo",
+          "returnType" : "Long",
           "documentation" : null
         },
         "http" : {
@@ -6889,11 +8948,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "configurationInfo",
+          "marshallLocationName" : "revision",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "configurationInfo",
+          "unmarshallLocationName" : "revision",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -6903,114 +8962,225 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "ConfigurationInfo",
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "Revision",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@param configurationInfo Comprises of the Configuration to be used on Kafka brokers in a cluster.*/",
-        "setterMethodName" : "setConfigurationInfo",
+        "setterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@param revision <p>The revision of the configuration to use.</p>*/",
+        "setterMethodName" : "setRevision",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationInfo",
-          "variableName" : "configurationInfo",
-          "variableType" : "ConfigurationInfo",
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
           "documentation" : "",
-          "simpleType" : "ConfigurationInfo",
-          "variableSetterType" : "ConfigurationInfo"
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@param configurationInfo Comprises of the Configuration to be used on Kafka brokers in a cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@param revision <p>The revision of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationInfo",
-          "variableName" : "configurationInfo",
-          "variableType" : "ConfigurationInfo",
-          "documentation" : "<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>",
-          "simpleType" : "ConfigurationInfo",
-          "variableSetterType" : "ConfigurationInfo"
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
+          "documentation" : "\n            <p>The revision of the configuration to use.</p>\n         ",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "EncryptionInfo",
-        "c2jShape" : "EncryptionInfo",
-        "deprecated" : false,
-        "documentation" : "<p>Includes all encryption-related information.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withEncryptionInfo",
-        "getterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@return Includes all encryption-related information.*/",
-        "getterMethodName" : "getEncryptionInfo",
-        "getterModel" : {
-          "returnType" : "EncryptionInfo",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "encryptionInfo",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "encryptionInfo",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "EncryptionInfo",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.*/",
-        "setterMethodName" : "setEncryptionInfo",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "EncryptionInfo",
-          "variableName" : "encryptionInfo",
-          "variableType" : "EncryptionInfo",
-          "documentation" : "",
-          "simpleType" : "EncryptionInfo",
-          "variableSetterType" : "EncryptionInfo"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "EncryptionInfo",
-          "variableName" : "encryptionInfo",
-          "variableType" : "EncryptionInfo",
-          "documentation" : "<p>Includes all encryption-related information.</p>",
-          "simpleType" : "EncryptionInfo",
-          "variableSetterType" : "EncryptionInfo"
+      } ],
+      "membersAsMap" : {
+        "Arn" : {
+          "c2jName" : "Arn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>ARN of the configuration to use.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@param arn <p>ARN of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArn",
+          "getterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@return <p>ARN of the configuration to use.</p>*/",
+          "getterMethodName" : "getArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "arn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "arn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Arn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@param arn <p>ARN of the configuration to use.</p>*/",
+          "setterMethodName" : "setArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>ARN of the configuration to use.</p>\n         \n@param arn <p>ARN of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>ARN of the configuration to use.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "EnhancedMonitoring",
-        "c2jShape" : "EnhancedMonitoring",
+        "Revision" : {
+          "c2jName" : "Revision",
+          "c2jShape" : "__long",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The revision of the configuration to use.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@param revision <p>The revision of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRevision",
+          "getterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@return <p>The revision of the configuration to use.</p>*/",
+          "getterMethodName" : "getRevision",
+          "getterModel" : {
+            "returnType" : "Long",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "revision",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "revision",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "Revision",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@param revision <p>The revision of the configuration to use.</p>*/",
+          "setterMethodName" : "setRevision",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The revision of the configuration to use.</p>\n         \n@param revision <p>The revision of the configuration to use.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "\n            <p>The revision of the configuration to use.</p>\n         ",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "Revision", "Arn" ],
+      "shapeName" : "ConfigurationInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ConfigurationInfo",
+        "variableName" : "configurationInfo",
+        "variableType" : "ConfigurationInfo",
+        "documentation" : null,
+        "simpleType" : "ConfigurationInfo",
+        "variableSetterType" : "ConfigurationInfo"
+      },
+      "wrapper" : false
+    },
+    "ConfigurationRevision" : {
+      "c2jName" : "ConfigurationRevision",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Describes a configuration revision.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "CreationTime",
+        "c2jShape" : "__timestampIso8601",
         "deprecated" : false,
-        "documentation" : "<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
-        "enumType" : "EnhancedMonitoring",
-        "fluentSetterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
-        "fluentSetterMethodName" : "withEnhancedMonitoring",
-        "getterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
-        "getterMethodName" : "getEnhancedMonitoring",
+        "documentation" : "\n            <p>The time when the configuration revision was created.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@param creationTime <p>The time when the configuration revision was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@return <p>The time when the configuration revision was created.</p>*/",
+        "getterMethodName" : "getCreationTime",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "java.util.Date",
           "documentation" : null
         },
         "http" : {
@@ -7023,11 +9193,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "enhancedMonitoring",
+          "marshallLocationName" : "creationTime",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "enhancedMonitoring",
+          "unmarshallLocationName" : "creationTime",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -7037,45 +9207,45 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "EnhancedMonitoring",
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
-        "setterMethodName" : "setEnhancedMonitoring",
+        "setterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@param creationTime <p>The time when the configuration revision was created.</p>*/",
+        "setterMethodName" : "setCreationTime",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "enhancedMonitoring",
-          "variableType" : "String",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+        "varargSetterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@param creationTime <p>The time when the configuration revision was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "enhancedMonitoring",
-          "variableType" : "String",
-          "documentation" : "<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "timestampFormat" : "iso8601",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "\n            <p>The time when the configuration revision was created.</p>\n         ",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "KafkaVersion",
-        "c2jShape" : "__stringMin1Max128",
+        "c2jName" : "Description",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The version of Apache Kafka.</p>",
+        "documentation" : "\n            <p>The description of the configuration revision.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withKafkaVersion",
-        "getterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@return The version of Apache Kafka.*/",
-        "getterMethodName" : "getKafkaVersion",
+        "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@param description <p>The description of the configuration revision.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDescription",
+        "getterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@return <p>The description of the configuration revision.</p>*/",
+        "getterMethodName" : "getDescription",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -7090,11 +9260,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "kafkaVersion",
+          "marshallLocationName" : "description",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "kafkaVersion",
+          "unmarshallLocationName" : "description",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -7106,14 +9276,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "KafkaVersion",
+        "name" : "Description",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.*/",
-        "setterMethodName" : "setKafkaVersion",
+        "setterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@param description <p>The description of the configuration revision.</p>*/",
+        "setterMethodName" : "setDescription",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "kafkaVersion",
+          "variableName" : "description",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -7122,29 +9292,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@param description <p>The description of the configuration revision.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "kafkaVersion",
+          "variableName" : "description",
           "variableType" : "String",
-          "documentation" : "<p>The version of Apache Kafka.</p>",
+          "documentation" : "\n            <p>The description of the configuration revision.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "NumberOfBrokerNodes",
-        "c2jShape" : "__integerMin1Max15",
+        "c2jName" : "Revision",
+        "c2jShape" : "__long",
         "deprecated" : false,
-        "documentation" : "<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>",
+        "documentation" : "\n            <p>The revision number.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNumberOfBrokerNodes",
-        "getterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@return The number of Kafka broker nodes in the Amazon MSK cluster.*/",
-        "getterMethodName" : "getNumberOfBrokerNodes",
+        "fluentSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRevision",
+        "getterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@return <p>The revision number.</p>*/",
+        "getterMethodName" : "getRevision",
         "getterModel" : {
-          "returnType" : "Integer",
+          "returnType" : "Long",
           "documentation" : null
         },
         "http" : {
@@ -7157,11 +9327,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "numberOfBrokerNodes",
+          "marshallLocationName" : "revision",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "numberOfBrokerNodes",
+          "unmarshallLocationName" : "revision",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -7171,49 +9341,49 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "NumberOfBrokerNodes",
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "Revision",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the Amazon MSK cluster.*/",
-        "setterMethodName" : "setNumberOfBrokerNodes",
+        "setterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>*/",
+        "setterMethodName" : "setRevision",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "numberOfBrokerNodes",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "numberOfBrokerNodes",
-          "variableType" : "Integer",
-          "documentation" : "<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
+          "documentation" : "\n            <p>The revision number.</p>\n         ",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "BrokerNodeGroupInfo" : {
-          "c2jName" : "BrokerNodeGroupInfo",
-          "c2jShape" : "BrokerNodeGroupInfo",
+        "CreationTime" : {
+          "c2jName" : "CreationTime",
+          "c2jShape" : "__timestampIso8601",
           "deprecated" : false,
-          "documentation" : "<p>Information about the broker nodes in the cluster.</p>",
+          "documentation" : "\n            <p>The time when the configuration revision was created.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@param brokerNodeGroupInfo Information about the broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
-          "getterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@return Information about the broker nodes in the cluster.*/",
-          "getterMethodName" : "getBrokerNodeGroupInfo",
+          "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@param creationTime <p>The time when the configuration revision was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@return <p>The time when the configuration revision was created.</p>*/",
+          "getterMethodName" : "getCreationTime",
           "getterModel" : {
-            "returnType" : "BrokerNodeGroupInfo",
+            "returnType" : "java.util.Date",
             "documentation" : null
           },
           "http" : {
@@ -7226,11 +9396,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "brokerNodeGroupInfo",
+            "marshallLocationName" : "creationTime",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "brokerNodeGroupInfo",
+            "unmarshallLocationName" : "creationTime",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -7240,46 +9410,46 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "BrokerNodeGroupInfo",
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@param brokerNodeGroupInfo Information about the broker nodes in the cluster.*/",
-          "setterMethodName" : "setBrokerNodeGroupInfo",
+          "setterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@param creationTime <p>The time when the configuration revision was created.</p>*/",
+          "setterMethodName" : "setCreationTime",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "BrokerNodeGroupInfo",
-            "variableName" : "brokerNodeGroupInfo",
-            "variableType" : "BrokerNodeGroupInfo",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
             "documentation" : "",
-            "simpleType" : "BrokerNodeGroupInfo",
-            "variableSetterType" : "BrokerNodeGroupInfo"
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Information about the broker nodes in the cluster.</p>\n@param brokerNodeGroupInfo Information about the broker nodes in the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The time when the configuration revision was created.</p>\n         \n@param creationTime <p>The time when the configuration revision was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "BrokerNodeGroupInfo",
-            "variableName" : "brokerNodeGroupInfo",
-            "variableType" : "BrokerNodeGroupInfo",
-            "documentation" : "<p>Information about the broker nodes in the cluster.</p>",
-            "simpleType" : "BrokerNodeGroupInfo",
-            "variableSetterType" : "BrokerNodeGroupInfo"
+            "timestampFormat" : "iso8601",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "\n            <p>The time when the configuration revision was created.</p>\n         ",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
           },
           "xmlNameSpaceUri" : null
         },
-        "ClusterName" : {
-          "c2jName" : "ClusterName",
-          "c2jShape" : "__stringMin1Max64",
+        "Description" : {
+          "c2jName" : "Description",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The name of the cluster.</p>",
+          "documentation" : "\n            <p>The description of the configuration revision.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterName",
-          "getterDocumentation" : "/**<p>The name of the cluster.</p>\n@return The name of the cluster.*/",
-          "getterMethodName" : "getClusterName",
+          "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@param description <p>The description of the configuration revision.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDescription",
+          "getterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@return <p>The description of the configuration revision.</p>*/",
+          "getterMethodName" : "getDescription",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -7294,11 +9464,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "clusterName",
+            "marshallLocationName" : "description",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterName",
+            "unmarshallLocationName" : "description",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -7310,14 +9480,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ClusterName",
+          "name" : "Description",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.*/",
-          "setterMethodName" : "setClusterName",
+          "setterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@param description <p>The description of the configuration revision.</p>*/",
+          "setterMethodName" : "setDescription",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterName",
+            "variableName" : "description",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -7326,30 +9496,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the cluster.</p>\n@param clusterName The name of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The description of the configuration revision.</p>\n         \n@param description <p>The description of the configuration revision.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterName",
+            "variableName" : "description",
             "variableType" : "String",
-            "documentation" : "<p>The name of the cluster.</p>",
+            "documentation" : "\n            <p>The description of the configuration revision.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "ConfigurationInfo" : {
-          "c2jName" : "ConfigurationInfo",
-          "c2jShape" : "ConfigurationInfo",
+        "Revision" : {
+          "c2jName" : "Revision",
+          "c2jShape" : "__long",
           "deprecated" : false,
-          "documentation" : "<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>",
+          "documentation" : "\n            <p>The revision number.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@param configurationInfo Comprises of the Configuration to be used on Kafka brokers in a cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withConfigurationInfo",
-          "getterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@return Comprises of the Configuration to be used on Kafka brokers in a cluster.*/",
-          "getterMethodName" : "getConfigurationInfo",
+          "fluentSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRevision",
+          "getterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@return <p>The revision number.</p>*/",
+          "getterMethodName" : "getRevision",
           "getterModel" : {
-            "returnType" : "ConfigurationInfo",
+            "returnType" : "Long",
             "documentation" : null
           },
           "http" : {
@@ -7362,11 +9532,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "configurationInfo",
+            "marshallLocationName" : "revision",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "configurationInfo",
+            "unmarshallLocationName" : "revision",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -7376,182 +9546,155 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "ConfigurationInfo",
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "Revision",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@param configurationInfo Comprises of the Configuration to be used on Kafka brokers in a cluster.*/",
-          "setterMethodName" : "setConfigurationInfo",
+          "setterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>*/",
+          "setterMethodName" : "setRevision",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationInfo",
-            "variableName" : "configurationInfo",
-            "variableType" : "ConfigurationInfo",
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
             "documentation" : "",
-            "simpleType" : "ConfigurationInfo",
-            "variableSetterType" : "ConfigurationInfo"
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>\n@param configurationInfo Comprises of the Configuration to be used on Kafka brokers in a cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationInfo",
-            "variableName" : "configurationInfo",
-            "variableType" : "ConfigurationInfo",
-            "documentation" : "<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>",
-            "simpleType" : "ConfigurationInfo",
-            "variableSetterType" : "ConfigurationInfo"
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "\n            <p>The revision number.</p>\n         ",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
           },
           "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "Revision", "CreationTime" ],
+      "shapeName" : "ConfigurationRevision",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ConfigurationRevision",
+        "variableName" : "configurationRevision",
+        "variableType" : "ConfigurationRevision",
+        "documentation" : null,
+        "simpleType" : "ConfigurationRevision",
+        "variableSetterType" : "ConfigurationRevision"
+      },
+      "wrapper" : false
+    },
+    "ConflictException" : {
+      "c2jName" : "ConflictException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
+      "enums" : null,
+      "errorCode" : "ConflictException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "InvalidParameter",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInvalidParameter",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+        "getterMethodName" : "getInvalidParameter",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
         },
-        "EncryptionInfo" : {
-          "c2jName" : "EncryptionInfo",
-          "c2jShape" : "EncryptionInfo",
-          "deprecated" : false,
-          "documentation" : "<p>Includes all encryption-related information.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withEncryptionInfo",
-          "getterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@return Includes all encryption-related information.*/",
-          "getterMethodName" : "getEncryptionInfo",
-          "getterModel" : {
-            "returnType" : "EncryptionInfo",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "encryptionInfo",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "encryptionInfo",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "EncryptionInfo",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.*/",
-          "setterMethodName" : "setEncryptionInfo",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "EncryptionInfo",
-            "variableName" : "encryptionInfo",
-            "variableType" : "EncryptionInfo",
-            "documentation" : "",
-            "simpleType" : "EncryptionInfo",
-            "variableSetterType" : "EncryptionInfo"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Includes all encryption-related information.</p>\n@param encryptionInfo Includes all encryption-related information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "EncryptionInfo",
-            "variableName" : "encryptionInfo",
-            "variableType" : "EncryptionInfo",
-            "documentation" : "<p>Includes all encryption-related information.</p>",
-            "simpleType" : "EncryptionInfo",
-            "variableSetterType" : "EncryptionInfo"
-          },
-          "xmlNameSpaceUri" : null
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "invalidParameter",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "invalidParameter",
+          "uri" : false
         },
-        "EnhancedMonitoring" : {
-          "c2jName" : "EnhancedMonitoring",
-          "c2jShape" : "EnhancedMonitoring",
-          "deprecated" : false,
-          "documentation" : "<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
-          "enumType" : "EnhancedMonitoring",
-          "fluentSetterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
-          "fluentSetterMethodName" : "withEnhancedMonitoring",
-          "getterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
-          "getterMethodName" : "getEnhancedMonitoring",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "enhancedMonitoring",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "enhancedMonitoring",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "EnhancedMonitoring",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@see EnhancedMonitoring*/",
-          "setterMethodName" : "setEnhancedMonitoring",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "enhancedMonitoring",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@param enhancedMonitoring Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "enhancedMonitoring",
-            "variableType" : "String",
-            "documentation" : "<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InvalidParameter",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+        "setterMethodName" : "setInvalidParameter",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
-        "KafkaVersion" : {
-          "c2jName" : "KafkaVersion",
-          "c2jShape" : "__stringMin1Max128",
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InvalidParameter" : {
+          "c2jName" : "InvalidParameter",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The version of Apache Kafka.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withKafkaVersion",
-          "getterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@return The version of Apache Kafka.*/",
-          "getterMethodName" : "getKafkaVersion",
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInvalidParameter",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+          "getterMethodName" : "getInvalidParameter",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -7566,11 +9709,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "kafkaVersion",
+            "marshallLocationName" : "invalidParameter",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "kafkaVersion",
+            "unmarshallLocationName" : "invalidParameter",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -7582,14 +9725,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "KafkaVersion",
+          "name" : "InvalidParameter",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.*/",
-          "setterMethodName" : "setKafkaVersion",
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+          "setterMethodName" : "setInvalidParameter",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "kafkaVersion",
+            "variableName" : "invalidParameter",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -7598,107 +9741,39 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The version of Apache Kafka.</p>\n@param kafkaVersion The version of Apache Kafka.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "kafkaVersion",
+            "variableName" : "invalidParameter",
             "variableType" : "String",
-            "documentation" : "<p>The version of Apache Kafka.</p>",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        },
-        "NumberOfBrokerNodes" : {
-          "c2jName" : "NumberOfBrokerNodes",
-          "c2jShape" : "__integerMin1Max15",
-          "deprecated" : false,
-          "documentation" : "<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNumberOfBrokerNodes",
-          "getterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@return The number of Kafka broker nodes in the Amazon MSK cluster.*/",
-          "getterMethodName" : "getNumberOfBrokerNodes",
-          "getterModel" : {
-            "returnType" : "Integer",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "numberOfBrokerNodes",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "numberOfBrokerNodes",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "NumberOfBrokerNodes",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the Amazon MSK cluster.*/",
-          "setterMethodName" : "setNumberOfBrokerNodes",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "numberOfBrokerNodes",
-            "variableType" : "Integer",
-            "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>\n@param numberOfBrokerNodes The number of Kafka broker nodes in the Amazon MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "numberOfBrokerNodes",
-            "variableType" : "Integer",
-            "documentation" : "<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "BrokerNodeGroupInfo", "KafkaVersion", "NumberOfBrokerNodes", "ClusterName" ],
-      "shapeName" : "CreateClusterRequest",
+      "required" : null,
+      "shapeName" : "ConflictException",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "CreateClusterRequest",
-        "variableName" : "createClusterRequest",
-        "variableType" : "CreateClusterRequest",
+        "variableDeclarationType" : "ConflictException",
+        "variableName" : "conflictException",
+        "variableType" : "ConflictException",
         "documentation" : null,
-        "simpleType" : "CreateClusterRequest",
-        "variableSetterType" : "CreateClusterRequest"
+        "simpleType" : "ConflictException",
+        "variableSetterType" : "ConflictException"
       },
       "wrapper" : false
     },
-    "CreateClusterResult" : {
-      "c2jName" : "CreateClusterResponse",
+    "CreateClusterRequest" : {
+      "c2jName" : "CreateClusterRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -7714,19 +9789,26 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "CreateCluster",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "ClusterArn",
-        "c2jShape" : "__string",
+        "c2jName" : "BrokerNodeGroupInfo",
+        "c2jShape" : "BrokerNodeGroupInfo",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
+        "documentation" : "\n            <p>Information about the broker nodes in the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return The Amazon Resource Name (ARN) of the cluster.*/",
-        "getterMethodName" : "getClusterArn",
+        "fluentSetterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
+        "getterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@return <p>Information about the broker nodes in the cluster.</p>*/",
+        "getterMethodName" : "getBrokerNodeGroupInfo",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "BrokerNodeGroupInfo",
           "documentation" : null
         },
         "http" : {
@@ -7739,11 +9821,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterArn",
+          "marshallLocationName" : "brokerNodeGroupInfo",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterArn",
+          "unmarshallLocationName" : "brokerNodeGroupInfo",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -7753,44 +9835,111 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "ClusterArn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.*/",
-        "setterMethodName" : "setClusterArn",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "BrokerNodeGroupInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes in the cluster.</p>*/",
+        "setterMethodName" : "setBrokerNodeGroupInfo",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
-          "variableType" : "String",
+          "variableDeclarationType" : "BrokerNodeGroupInfo",
+          "variableName" : "brokerNodeGroupInfo",
+          "variableType" : "BrokerNodeGroupInfo",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "BrokerNodeGroupInfo",
+          "variableSetterType" : "BrokerNodeGroupInfo"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
-          "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "BrokerNodeGroupInfo",
+          "variableName" : "brokerNodeGroupInfo",
+          "variableType" : "BrokerNodeGroupInfo",
+          "documentation" : "\n            <p>Information about the broker nodes in the cluster.</p>\n         ",
+          "simpleType" : "BrokerNodeGroupInfo",
+          "variableSetterType" : "BrokerNodeGroupInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ClientAuthentication",
+        "c2jShape" : "ClientAuthentication",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Includes all client authentication related information.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClientAuthentication",
+        "getterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@return <p>Includes all client authentication related information.</p>*/",
+        "getterMethodName" : "getClientAuthentication",
+        "getterModel" : {
+          "returnType" : "ClientAuthentication",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clientAuthentication",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clientAuthentication",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ClientAuthentication",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication related information.</p>*/",
+        "setterMethodName" : "setClientAuthentication",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ClientAuthentication",
+          "variableName" : "clientAuthentication",
+          "variableType" : "ClientAuthentication",
+          "documentation" : "",
+          "simpleType" : "ClientAuthentication",
+          "variableSetterType" : "ClientAuthentication"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ClientAuthentication",
+          "variableName" : "clientAuthentication",
+          "variableType" : "ClientAuthentication",
+          "documentation" : "\n            <p>Includes all client authentication related information.</p>\n         ",
+          "simpleType" : "ClientAuthentication",
+          "variableSetterType" : "ClientAuthentication"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "ClusterName",
-        "c2jShape" : "__string",
+        "c2jShape" : "__stringMin1Max64",
         "deprecated" : false,
-        "documentation" : "<p>The name of the MSK cluster.</p>",
+        "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@param clusterName The name of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withClusterName",
-        "getterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@return The name of the MSK cluster.*/",
+        "getterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@return <p>The name of the cluster.</p>*/",
         "getterMethodName" : "getClusterName",
         "getterModel" : {
           "returnType" : "String",
@@ -7824,7 +9973,7 @@
         "marshallingType" : "STRING",
         "name" : "ClusterName",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@param clusterName The name of the MSK cluster.*/",
+        "setterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>*/",
         "setterMethodName" : "setClusterName",
         "setterModel" : {
           "timestampFormat" : null,
@@ -7838,27 +9987,161 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@param clusterName The name of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "clusterName",
           "variableType" : "String",
-          "documentation" : "<p>The name of the MSK cluster.</p>",
+          "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "State",
-        "c2jShape" : "ClusterState",
+        "c2jName" : "ConfigurationInfo",
+        "c2jShape" : "ConfigurationInfo",
         "deprecated" : false,
-        "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
-        "enumType" : "ClusterState",
-        "fluentSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
-        "fluentSetterMethodName" : "withState",
-        "getterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-        "getterMethodName" : "getState",
+        "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withConfigurationInfo",
+        "getterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@return <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+        "getterMethodName" : "getConfigurationInfo",
+        "getterModel" : {
+          "returnType" : "ConfigurationInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "configurationInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "configurationInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ConfigurationInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+        "setterMethodName" : "setConfigurationInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationInfo",
+          "variableName" : "configurationInfo",
+          "variableType" : "ConfigurationInfo",
+          "documentation" : "",
+          "simpleType" : "ConfigurationInfo",
+          "variableSetterType" : "ConfigurationInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationInfo",
+          "variableName" : "configurationInfo",
+          "variableType" : "ConfigurationInfo",
+          "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+          "simpleType" : "ConfigurationInfo",
+          "variableSetterType" : "ConfigurationInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "EncryptionInfo",
+        "c2jShape" : "EncryptionInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEncryptionInfo",
+        "getterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@return <p>Includes all encryption-related information.</p>*/",
+        "getterMethodName" : "getEncryptionInfo",
+        "getterModel" : {
+          "returnType" : "EncryptionInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "encryptionInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "encryptionInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "EncryptionInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>*/",
+        "setterMethodName" : "setEncryptionInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "EncryptionInfo",
+          "variableName" : "encryptionInfo",
+          "variableType" : "EncryptionInfo",
+          "documentation" : "",
+          "simpleType" : "EncryptionInfo",
+          "variableSetterType" : "EncryptionInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "EncryptionInfo",
+          "variableName" : "encryptionInfo",
+          "variableType" : "EncryptionInfo",
+          "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
+          "simpleType" : "EncryptionInfo",
+          "variableSetterType" : "EncryptionInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "EnhancedMonitoring",
+        "c2jShape" : "EnhancedMonitoring",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         ",
+        "enumType" : "EnhancedMonitoring",
+        "fluentSetterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@param enhancedMonitoring <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+        "fluentSetterMethodName" : "withEnhancedMonitoring",
+        "getterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@return <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@see EnhancedMonitoring*/",
+        "getterMethodName" : "getEnhancedMonitoring",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -7873,11 +10156,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "state",
+          "marshallLocationName" : "enhancedMonitoring",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "state",
+          "unmarshallLocationName" : "enhancedMonitoring",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -7889,14 +10172,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "State",
+        "name" : "EnhancedMonitoring",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-        "setterMethodName" : "setState",
+        "setterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@param enhancedMonitoring <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@see EnhancedMonitoring*/",
+        "setterMethodName" : "setEnhancedMonitoring",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "state",
+          "variableName" : "enhancedMonitoring",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -7905,280 +10188,27 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "varargSetterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@param enhancedMonitoring <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "state",
+          "variableName" : "enhancedMonitoring",
           "variableType" : "String",
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+          "documentation" : "\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "ClusterArn" : {
-          "c2jName" : "ClusterArn",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return The Amazon Resource Name (ARN) of the cluster.*/",
-          "getterMethodName" : "getClusterArn",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "clusterArn",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "clusterArn",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "ClusterArn",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.*/",
-          "setterMethodName" : "setClusterArn",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "ClusterName" : {
-          "c2jName" : "ClusterName",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The name of the MSK cluster.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@param clusterName The name of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterName",
-          "getterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@return The name of the MSK cluster.*/",
-          "getterMethodName" : "getClusterName",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "clusterName",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "clusterName",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "ClusterName",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@param clusterName The name of the MSK cluster.*/",
-          "setterMethodName" : "setClusterName",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterName",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the MSK cluster.</p>\n@param clusterName The name of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterName",
-            "variableType" : "String",
-            "documentation" : "<p>The name of the MSK cluster.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "State" : {
-          "c2jName" : "State",
-          "c2jShape" : "ClusterState",
-          "deprecated" : false,
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
-          "enumType" : "ClusterState",
-          "fluentSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
-          "fluentSetterMethodName" : "withState",
-          "getterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-          "getterMethodName" : "getState",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "state",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "state",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "State",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-          "setterMethodName" : "setState",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "state",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "state",
-            "variableType" : "String",
-            "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "CreateClusterResult",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "CreateClusterResult",
-        "variableName" : "createClusterResult",
-        "variableType" : "CreateClusterResult",
-        "documentation" : null,
-        "simpleType" : "CreateClusterResult",
-        "variableSetterType" : "CreateClusterResult"
-      },
-      "wrapper" : false
-    },
-    "CreateConfigurationRequest" : {
-      "c2jName" : "CreateConfigurationRequest",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "CreateConfiguration",
-        "locationName" : null,
-        "requestUri" : "/v1/configurations",
-        "target" : null,
-        "verb" : "POST",
-        "xmlNameSpaceUri" : null
-      },
-      "members" : [ {
-        "c2jName" : "Description",
-        "c2jShape" : "__string",
+      }, {
+        "c2jName" : "KafkaVersion",
+        "c2jShape" : "__stringMin1Max128",
         "deprecated" : false,
-        "documentation" : "<p>The description of the configuration.</p>",
+        "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withDescription",
-        "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
-        "getterMethodName" : "getDescription",
+        "fluentSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKafkaVersion",
+        "getterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@return <p>The version of Apache Kafka.</p>*/",
+        "getterMethodName" : "getKafkaVersion",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -8193,11 +10223,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "description",
+          "marshallLocationName" : "kafkaVersion",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "description",
+          "unmarshallLocationName" : "kafkaVersion",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -8209,14 +10239,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Description",
+        "name" : "KafkaVersion",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
-        "setterMethodName" : "setDescription",
+        "setterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>*/",
+        "setterMethodName" : "setKafkaVersion",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "description",
+          "variableName" : "kafkaVersion",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -8225,29 +10255,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "description",
+          "variableName" : "kafkaVersion",
           "variableType" : "String",
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "KafkaVersions",
-        "c2jShape" : "__listOf__string",
+        "c2jName" : "NumberOfBrokerNodes",
+        "c2jShape" : "__integerMin1Max15",
         "deprecated" : false,
-        "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
+        "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withKafkaVersions",
-        "getterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return The versions of Apache Kafka with which you can use this MSK configuration.*/",
-        "getterMethodName" : "getKafkaVersions",
+        "fluentSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNumberOfBrokerNodes",
+        "getterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@return <p>The number of broker nodes in the cluster.</p>*/",
+        "getterMethodName" : "getNumberOfBrokerNodes",
         "getterModel" : {
-          "returnType" : "java.util.List<String>",
+          "returnType" : "Integer",
           "documentation" : null
         },
         "http" : {
@@ -8260,49 +10290,122 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "kafkaVersions",
+          "marshallLocationName" : "numberOfBrokerNodes",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "kafkaVersions",
+          "unmarshallLocationName" : "numberOfBrokerNodes",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "__string",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "String",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "NumberOfBrokerNodes",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>*/",
+        "setterMethodName" : "setNumberOfBrokerNodes",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "numberOfBrokerNodes",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "numberOfBrokerNodes",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Tags",
+        "c2jShape" : "__mapOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Create tags when creating the cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@param tags <p>Create tags when creating the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@return <p>Create tags when creating the cluster.</p>*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.Map<String,String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getValue",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
               "location" : null,
               "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
+              "marshallLocationName" : "value",
               "queryString" : false,
               "requiresLength" : false,
               "statusCode" : false,
-              "unmarshallLocationName" : "member",
+              "unmarshallLocationName" : "value",
               "uri" : false
             },
             "idempotencyToken" : false,
@@ -8314,14 +10417,14 @@
             "mapModel" : null,
             "marshallingTargetClass" : "String",
             "marshallingType" : "STRING",
-            "name" : "Member",
+            "name" : "Value",
             "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
             "setterModel" : {
               "timestampFormat" : null,
               "variableDeclarationType" : "String",
-              "variableName" : "member",
+              "variableName" : "value",
               "variableType" : "String",
               "documentation" : "",
               "simpleType" : "String",
@@ -8330,11 +10433,11 @@
             "shouldEmitLegacyEnumSetter" : false,
             "simple" : true,
             "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
               "variableDeclarationType" : "String",
-              "variableName" : "member",
+              "variableName" : "value",
               "variableType" : "String",
               "documentation" : "",
               "simpleType" : "String",
@@ -8342,197 +10445,125 @@
             },
             "xmlNameSpaceUri" : null
           },
-          "memberLocationName" : null,
-          "memberType" : "String",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : true,
-          "simpleType" : "String",
-          "templateImplType" : "java.util.ArrayList<String>",
-          "templateType" : "java.util.List<String>"
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
         },
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "KafkaVersions",
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.*/",
-        "setterMethodName" : "setKafkaVersions",
+        "setterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@param tags <p>Create tags when creating the cluster.</p>*/",
+        "setterMethodName" : "setTags",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "kafkaVersions",
-          "variableType" : "java.util.List<String>",
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
           "documentation" : "",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@param tags <p>Create tags when creating the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "kafkaVersions",
-          "variableType" : "java.util.List<String>",
-          "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "\n            <p>Create tags when creating the cluster.</p>\n         ",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "Name",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The name of the configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withName",
-        "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-        "getterMethodName" : "getName",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "name",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "name",
-          "uri" : false
+      } ],
+      "membersAsMap" : {
+        "BrokerNodeGroupInfo" : {
+          "c2jName" : "BrokerNodeGroupInfo",
+          "c2jShape" : "BrokerNodeGroupInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Information about the broker nodes in the cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBrokerNodeGroupInfo",
+          "getterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@return <p>Information about the broker nodes in the cluster.</p>*/",
+          "getterMethodName" : "getBrokerNodeGroupInfo",
+          "getterModel" : {
+            "returnType" : "BrokerNodeGroupInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "brokerNodeGroupInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "brokerNodeGroupInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "BrokerNodeGroupInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes in the cluster.</p>*/",
+          "setterMethodName" : "setBrokerNodeGroupInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "BrokerNodeGroupInfo",
+            "variableName" : "brokerNodeGroupInfo",
+            "variableType" : "BrokerNodeGroupInfo",
+            "documentation" : "",
+            "simpleType" : "BrokerNodeGroupInfo",
+            "variableSetterType" : "BrokerNodeGroupInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Information about the broker nodes in the cluster.</p>\n         \n@param brokerNodeGroupInfo <p>Information about the broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "BrokerNodeGroupInfo",
+            "variableName" : "brokerNodeGroupInfo",
+            "variableType" : "BrokerNodeGroupInfo",
+            "documentation" : "\n            <p>Information about the broker nodes in the cluster.</p>\n         ",
+            "simpleType" : "BrokerNodeGroupInfo",
+            "variableSetterType" : "BrokerNodeGroupInfo"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Name",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-        "setterMethodName" : "setName",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "name",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "name",
-          "variableType" : "String",
-          "documentation" : "<p>The name of the configuration.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "ServerProperties",
-        "c2jShape" : "__blob",
-        "deprecated" : false,
-        "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withServerProperties",
-        "getterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-        "getterMethodName" : "getServerProperties",
-        "getterModel" : {
-          "returnType" : "java.nio.ByteBuffer",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "serverProperties",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "serverProperties",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "java.nio.ByteBuffer",
-        "marshallingType" : "BYTE_BUFFER",
-        "name" : "ServerProperties",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-        "setterMethodName" : "setServerProperties",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.nio.ByteBuffer",
-          "variableName" : "serverProperties",
-          "variableType" : "java.nio.ByteBuffer",
-          "documentation" : "",
-          "simpleType" : "ByteBuffer",
-          "variableSetterType" : "java.nio.ByteBuffer"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.nio.ByteBuffer",
-          "variableName" : "serverProperties",
-          "variableType" : "java.nio.ByteBuffer",
-          "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
-          "simpleType" : "ByteBuffer",
-          "variableSetterType" : "java.nio.ByteBuffer"
-        },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "Description" : {
-          "c2jName" : "Description",
-          "c2jShape" : "__string",
+        "ClientAuthentication" : {
+          "c2jName" : "ClientAuthentication",
+          "c2jShape" : "ClientAuthentication",
           "deprecated" : false,
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>Includes all client authentication related information.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withDescription",
-          "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
-          "getterMethodName" : "getDescription",
+          "fluentSetterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClientAuthentication",
+          "getterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@return <p>Includes all client authentication related information.</p>*/",
+          "getterMethodName" : "getClientAuthentication",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "ClientAuthentication",
             "documentation" : null
           },
           "http" : {
@@ -8545,11 +10576,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "description",
+            "marshallLocationName" : "clientAuthentication",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "description",
+            "unmarshallLocationName" : "clientAuthentication",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -8559,48 +10590,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Description",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ClientAuthentication",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
-          "setterMethodName" : "setDescription",
+          "setterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication related information.</p>*/",
+          "setterMethodName" : "setClientAuthentication",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "description",
-            "variableType" : "String",
+            "variableDeclarationType" : "ClientAuthentication",
+            "variableName" : "clientAuthentication",
+            "variableType" : "ClientAuthentication",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "ClientAuthentication",
+            "variableSetterType" : "ClientAuthentication"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Includes all client authentication related information.</p>\n         \n@param clientAuthentication <p>Includes all client authentication related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "description",
-            "variableType" : "String",
-            "documentation" : "<p>The description of the configuration.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "ClientAuthentication",
+            "variableName" : "clientAuthentication",
+            "variableType" : "ClientAuthentication",
+            "documentation" : "\n            <p>Includes all client authentication related information.</p>\n         ",
+            "simpleType" : "ClientAuthentication",
+            "variableSetterType" : "ClientAuthentication"
           },
           "xmlNameSpaceUri" : null
         },
-        "KafkaVersions" : {
-          "c2jName" : "KafkaVersions",
-          "c2jShape" : "__listOf__string",
+        "ClusterName" : {
+          "c2jName" : "ClusterName",
+          "c2jShape" : "__stringMin1Max64",
           "deprecated" : false,
-          "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
+          "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withKafkaVersions",
-          "getterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return The versions of Apache Kafka with which you can use this MSK configuration.*/",
-          "getterMethodName" : "getKafkaVersions",
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterName",
+          "getterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@return <p>The name of the cluster.</p>*/",
+          "getterMethodName" : "getClusterName",
           "getterModel" : {
-            "returnType" : "java.util.List<String>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -8613,144 +10644,62 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "kafkaVersions",
+            "marshallLocationName" : "clusterName",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "kafkaVersions",
+            "unmarshallLocationName" : "clusterName",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "__string",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "String",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "String",
-              "marshallingType" : "STRING",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : true,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "String",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : true,
-            "simpleType" : "String",
-            "templateImplType" : "java.util.ArrayList<String>",
-            "templateType" : "java.util.List<String>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "KafkaVersions",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterName",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.*/",
-          "setterMethodName" : "setKafkaVersions",
+          "setterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>*/",
+          "setterMethodName" : "setClusterName",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "kafkaVersions",
-            "variableType" : "java.util.List<String>",
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterName",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The name of the cluster.</p>\n         \n@param clusterName <p>The name of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "kafkaVersions",
-            "variableType" : "java.util.List<String>",
-            "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterName",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The name of the cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Name" : {
-          "c2jName" : "Name",
-          "c2jShape" : "__string",
+        "ConfigurationInfo" : {
+          "c2jName" : "ConfigurationInfo",
+          "c2jShape" : "ConfigurationInfo",
           "deprecated" : false,
-          "documentation" : "<p>The name of the configuration.</p>",
+          "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withName",
-          "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-          "getterMethodName" : "getName",
+          "fluentSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withConfigurationInfo",
+          "getterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@return <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+          "getterMethodName" : "getConfigurationInfo",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "ConfigurationInfo",
             "documentation" : null
           },
           "http" : {
@@ -8763,11 +10712,147 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "name",
+            "marshallLocationName" : "configurationInfo",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "name",
+            "unmarshallLocationName" : "configurationInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ConfigurationInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+          "setterMethodName" : "setConfigurationInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationInfo",
+            "variableName" : "configurationInfo",
+            "variableType" : "ConfigurationInfo",
+            "documentation" : "",
+            "simpleType" : "ConfigurationInfo",
+            "variableSetterType" : "ConfigurationInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationInfo",
+            "variableName" : "configurationInfo",
+            "variableType" : "ConfigurationInfo",
+            "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+            "simpleType" : "ConfigurationInfo",
+            "variableSetterType" : "ConfigurationInfo"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "EncryptionInfo" : {
+          "c2jName" : "EncryptionInfo",
+          "c2jShape" : "EncryptionInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEncryptionInfo",
+          "getterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@return <p>Includes all encryption-related information.</p>*/",
+          "getterMethodName" : "getEncryptionInfo",
+          "getterModel" : {
+            "returnType" : "EncryptionInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "encryptionInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "encryptionInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "EncryptionInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>*/",
+          "setterMethodName" : "setEncryptionInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "EncryptionInfo",
+            "variableName" : "encryptionInfo",
+            "variableType" : "EncryptionInfo",
+            "documentation" : "",
+            "simpleType" : "EncryptionInfo",
+            "variableSetterType" : "EncryptionInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Includes all encryption-related information.</p>\n         \n@param encryptionInfo <p>Includes all encryption-related information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "EncryptionInfo",
+            "variableName" : "encryptionInfo",
+            "variableType" : "EncryptionInfo",
+            "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         ",
+            "simpleType" : "EncryptionInfo",
+            "variableSetterType" : "EncryptionInfo"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "EnhancedMonitoring" : {
+          "c2jName" : "EnhancedMonitoring",
+          "c2jShape" : "EnhancedMonitoring",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         ",
+          "enumType" : "EnhancedMonitoring",
+          "fluentSetterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@param enhancedMonitoring <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
+          "fluentSetterMethodName" : "withEnhancedMonitoring",
+          "getterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@return <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@see EnhancedMonitoring*/",
+          "getterMethodName" : "getEnhancedMonitoring",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "enhancedMonitoring",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "enhancedMonitoring",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -8779,14 +10864,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "Name",
+          "name" : "EnhancedMonitoring",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-          "setterMethodName" : "setName",
+          "setterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@param enhancedMonitoring <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@see EnhancedMonitoring*/",
+          "setterMethodName" : "setEnhancedMonitoring",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "name",
+            "variableName" : "enhancedMonitoring",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -8795,30 +10880,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         \n@param enhancedMonitoring <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see EnhancedMonitoring*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "name",
+            "variableName" : "enhancedMonitoring",
             "variableType" : "String",
-            "documentation" : "<p>The name of the configuration.</p>",
+            "documentation" : "\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "ServerProperties" : {
-          "c2jName" : "ServerProperties",
-          "c2jShape" : "__blob",
+        "KafkaVersion" : {
+          "c2jName" : "KafkaVersion",
+          "c2jShape" : "__stringMin1Max128",
           "deprecated" : false,
-          "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
+          "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withServerProperties",
-          "getterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-          "getterMethodName" : "getServerProperties",
+          "fluentSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKafkaVersion",
+          "getterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@return <p>The version of Apache Kafka.</p>*/",
+          "getterMethodName" : "getKafkaVersion",
           "getterModel" : {
-            "returnType" : "java.nio.ByteBuffer",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -8831,11 +10916,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "serverProperties",
+            "marshallLocationName" : "kafkaVersion",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "serverProperties",
+            "unmarshallLocationName" : "kafkaVersion",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -8845,355 +10930,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "java.nio.ByteBuffer",
-          "marshallingType" : "BYTE_BUFFER",
-          "name" : "ServerProperties",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KafkaVersion",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-          "setterMethodName" : "setServerProperties",
+          "setterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>*/",
+          "setterMethodName" : "setKafkaVersion",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.nio.ByteBuffer",
-            "variableName" : "serverProperties",
-            "variableType" : "java.nio.ByteBuffer",
+            "variableDeclarationType" : "String",
+            "variableName" : "kafkaVersion",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "ByteBuffer",
-            "variableSetterType" : "java.nio.ByteBuffer"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The version of Apache Kafka.</p>\n         \n@param kafkaVersion <p>The version of Apache Kafka.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.nio.ByteBuffer",
-            "variableName" : "serverProperties",
-            "variableType" : "java.nio.ByteBuffer",
-            "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
-            "simpleType" : "ByteBuffer",
-            "variableSetterType" : "java.nio.ByteBuffer"
+            "variableDeclarationType" : "String",
+            "variableName" : "kafkaVersion",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "ServerProperties", "KafkaVersions", "Name" ],
-      "shapeName" : "CreateConfigurationRequest",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "CreateConfigurationRequest",
-        "variableName" : "createConfigurationRequest",
-        "variableType" : "CreateConfigurationRequest",
-        "documentation" : null,
-        "simpleType" : "CreateConfigurationRequest",
-        "variableSetterType" : "CreateConfigurationRequest"
-      },
-      "wrapper" : false
-    },
-    "CreateConfigurationResult" : {
-      "c2jName" : "CreateConfigurationResponse",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "Arn",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
-        "getterMethodName" : "getArn",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "arn",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "arn",
-          "uri" : false
         },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Arn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
-        "setterMethodName" : "setArn",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "arn",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "arn",
-          "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "CreationTime",
-        "c2jShape" : "__timestampIso8601",
-        "deprecated" : false,
-        "documentation" : "<p>The time when the configuration was created.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCreationTime",
-        "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
-        "getterMethodName" : "getCreationTime",
-        "getterModel" : {
-          "returnType" : "java.util.Date",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "creationTime",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "creationTime",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "java.util.Date",
-        "marshallingType" : "DATE",
-        "name" : "CreationTime",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
-        "setterMethodName" : "setCreationTime",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
-          "documentation" : "",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : "iso8601",
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
-          "documentation" : "<p>The time when the configuration was created.</p>",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "LatestRevision",
-        "c2jShape" : "ConfigurationRevision",
-        "deprecated" : false,
-        "documentation" : "<p>Latest revision of the configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withLatestRevision",
-        "getterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@return Latest revision of the configuration.*/",
-        "getterMethodName" : "getLatestRevision",
-        "getterModel" : {
-          "returnType" : "ConfigurationRevision",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "latestRevision",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "latestRevision",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "LatestRevision",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.*/",
-        "setterMethodName" : "setLatestRevision",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationRevision",
-          "variableName" : "latestRevision",
-          "variableType" : "ConfigurationRevision",
-          "documentation" : "",
-          "simpleType" : "ConfigurationRevision",
-          "variableSetterType" : "ConfigurationRevision"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationRevision",
-          "variableName" : "latestRevision",
-          "variableType" : "ConfigurationRevision",
-          "documentation" : "<p>Latest revision of the configuration.</p>",
-          "simpleType" : "ConfigurationRevision",
-          "variableSetterType" : "ConfigurationRevision"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "Name",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The name of the configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withName",
-        "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-        "getterMethodName" : "getName",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "name",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "name",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Name",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-        "setterMethodName" : "setName",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "name",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "name",
-          "variableType" : "String",
-          "documentation" : "<p>The name of the configuration.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "Arn" : {
-          "c2jName" : "Arn",
-          "c2jShape" : "__string",
+        "NumberOfBrokerNodes" : {
+          "c2jName" : "NumberOfBrokerNodes",
+          "c2jShape" : "__integerMin1Max15",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
-          "getterMethodName" : "getArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNumberOfBrokerNodes",
+          "getterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@return <p>The number of broker nodes in the cluster.</p>*/",
+          "getterMethodName" : "getNumberOfBrokerNodes",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "Integer",
             "documentation" : null
           },
           "http" : {
@@ -9206,11 +10984,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "arn",
+            "marshallLocationName" : "numberOfBrokerNodes",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "arn",
+            "unmarshallLocationName" : "numberOfBrokerNodes",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -9220,116 +10998,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Arn",
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "NumberOfBrokerNodes",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
-          "setterMethodName" : "setArn",
+          "setterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>*/",
+          "setterMethodName" : "setNumberOfBrokerNodes",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "arn",
-            "variableType" : "String",
+            "variableDeclarationType" : "Integer",
+            "variableName" : "numberOfBrokerNodes",
+            "variableType" : "Integer",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "arn",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "Integer",
+            "variableName" : "numberOfBrokerNodes",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
           },
           "xmlNameSpaceUri" : null
         },
-        "CreationTime" : {
-          "c2jName" : "CreationTime",
-          "c2jShape" : "__timestampIso8601",
-          "deprecated" : false,
-          "documentation" : "<p>The time when the configuration was created.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withCreationTime",
-          "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
-          "getterMethodName" : "getCreationTime",
-          "getterModel" : {
-            "returnType" : "java.util.Date",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "creationTime",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "creationTime",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "java.util.Date",
-          "marshallingType" : "DATE",
-          "name" : "CreationTime",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
-          "setterMethodName" : "setCreationTime",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Date",
-            "variableName" : "creationTime",
-            "variableType" : "java.util.Date",
-            "documentation" : "",
-            "simpleType" : "Date",
-            "variableSetterType" : "java.util.Date"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : "iso8601",
-            "variableDeclarationType" : "java.util.Date",
-            "variableName" : "creationTime",
-            "variableType" : "java.util.Date",
-            "documentation" : "<p>The time when the configuration was created.</p>",
-            "simpleType" : "Date",
-            "variableSetterType" : "java.util.Date"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "LatestRevision" : {
-          "c2jName" : "LatestRevision",
-          "c2jShape" : "ConfigurationRevision",
+        "Tags" : {
+          "c2jName" : "Tags",
+          "c2jShape" : "__mapOf__string",
           "deprecated" : false,
-          "documentation" : "<p>Latest revision of the configuration.</p>",
+          "documentation" : "\n            <p>Create tags when creating the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withLatestRevision",
-          "getterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@return Latest revision of the configuration.*/",
-          "getterMethodName" : "getLatestRevision",
+          "fluentSetterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@param tags <p>Create tags when creating the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@return <p>Create tags when creating the cluster.</p>*/",
+          "getterMethodName" : "getTags",
           "getterModel" : {
-            "returnType" : "ConfigurationRevision",
+            "returnType" : "java.util.Map<String,String>",
             "documentation" : null
           },
           "http" : {
@@ -9342,11 +11052,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "latestRevision",
+            "marshallLocationName" : "tags",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "latestRevision",
+            "unmarshallLocationName" : "tags",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -9354,130 +11064,141 @@
           "jsonValue" : false,
           "list" : false,
           "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "LatestRevision",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.*/",
-          "setterMethodName" : "setLatestRevision",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationRevision",
-            "variableName" : "latestRevision",
-            "variableType" : "ConfigurationRevision",
-            "documentation" : "",
-            "simpleType" : "ConfigurationRevision",
-            "variableSetterType" : "ConfigurationRevision"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationRevision",
-            "variableName" : "latestRevision",
-            "variableType" : "ConfigurationRevision",
-            "documentation" : "<p>Latest revision of the configuration.</p>",
-            "simpleType" : "ConfigurationRevision",
-            "variableSetterType" : "ConfigurationRevision"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "Name" : {
-          "c2jName" : "Name",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The name of the configuration.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withName",
-          "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-          "getterMethodName" : "getName",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "name",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "name",
-            "uri" : false
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getValue",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "value",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "value",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
           },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Name",
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-          "setterMethodName" : "setName",
+          "setterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@param tags <p>Create tags when creating the cluster.</p>*/",
+          "setterMethodName" : "setTags",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "name",
-            "variableType" : "String",
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Create tags when creating the cluster.</p>\n         \n@param tags <p>Create tags when creating the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "name",
-            "variableType" : "String",
-            "documentation" : "<p>The name of the configuration.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "\n            <p>Create tags when creating the cluster.</p>\n         ",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "CreateConfigurationResult",
+      "required" : [ "BrokerNodeGroupInfo", "KafkaVersion", "NumberOfBrokerNodes", "ClusterName" ],
+      "shapeName" : "CreateClusterRequest",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
+      "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "CreateConfigurationResult",
-        "variableName" : "createConfigurationResult",
-        "variableType" : "CreateConfigurationResult",
+        "variableDeclarationType" : "CreateClusterRequest",
+        "variableName" : "createClusterRequest",
+        "variableType" : "CreateClusterRequest",
         "documentation" : null,
-        "simpleType" : "CreateConfigurationResult",
-        "variableSetterType" : "CreateConfigurationResult"
+        "simpleType" : "CreateClusterRequest",
+        "variableSetterType" : "CreateClusterRequest"
       },
       "wrapper" : false
     },
-    "DeleteClusterRequest" : {
-      "c2jName" : "DeleteClusterRequest",
+    "CreateClusterResult" : {
+      "c2jName" : "CreateClusterResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -9493,23 +11214,16 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "DeleteCluster",
-        "locationName" : null,
-        "requestUri" : "/v1/clusters/{clusterArn}",
-        "target" : null,
-        "verb" : "DELETE",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
         "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
         "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
@@ -9523,14 +11237,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
           "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
           "unmarshallLocationName" : "clusterArn",
-          "uri" : true
+          "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -9543,7 +11257,7 @@
         "marshallingType" : "STRING",
         "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
         "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
@@ -9557,27 +11271,27 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "CurrentVersion",
+        "c2jName" : "ClusterName",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The current version of the MSK cluster.</p>",
+        "documentation" : "\n            <p>The name of the MSK cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCurrentVersion",
-        "getterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@return The current version of the MSK cluster.*/",
-        "getterMethodName" : "getCurrentVersion",
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@param clusterName <p>The name of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterName",
+        "getterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@return <p>The name of the MSK cluster.</p>*/",
+        "getterMethodName" : "getClusterName",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -9590,13 +11304,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "currentVersion",
-          "queryString" : true,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterName",
+          "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "currentVersion",
+          "unmarshallLocationName" : "clusterName",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -9608,14 +11322,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "CurrentVersion",
+        "name" : "ClusterName",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.*/",
-        "setterMethodName" : "setCurrentVersion",
+        "setterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@param clusterName <p>The name of the MSK cluster.</p>*/",
+        "setterMethodName" : "setClusterName",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "currentVersion",
+          "variableName" : "clusterName",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -9624,13 +11338,80 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@param clusterName <p>The name of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "currentVersion",
+          "variableName" : "clusterName",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The name of the MSK cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "State",
+        "c2jShape" : "ClusterState",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
+        "enumType" : "ClusterState",
+        "fluentSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "fluentSetterMethodName" : "withState",
+        "getterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@return <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+        "getterMethodName" : "getState",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "state",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "state",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "State",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+        "setterMethodName" : "setState",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "state",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "state",
           "variableType" : "String",
-          "documentation" : "<p>The current version of the MSK cluster.</p>",
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -9641,11 +11422,11 @@
           "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
           "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
@@ -9659,14 +11440,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
             "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
             "unmarshallLocationName" : "clusterArn",
-            "uri" : true
+            "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -9679,7 +11460,7 @@
           "marshallingType" : "STRING",
           "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
           "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
@@ -9693,28 +11474,28 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "CurrentVersion" : {
-          "c2jName" : "CurrentVersion",
+        "ClusterName" : {
+          "c2jName" : "ClusterName",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The current version of the MSK cluster.</p>",
+          "documentation" : "\n            <p>The name of the MSK cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withCurrentVersion",
-          "getterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@return The current version of the MSK cluster.*/",
-          "getterMethodName" : "getCurrentVersion",
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@param clusterName <p>The name of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterName",
+          "getterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@return <p>The name of the MSK cluster.</p>*/",
+          "getterMethodName" : "getClusterName",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -9727,13 +11508,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "currentVersion",
-            "queryString" : true,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clusterName",
+            "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "currentVersion",
+            "unmarshallLocationName" : "clusterName",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -9745,14 +11526,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "CurrentVersion",
+          "name" : "ClusterName",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.*/",
-          "setterMethodName" : "setCurrentVersion",
+          "setterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@param clusterName <p>The name of the MSK cluster.</p>*/",
+          "setterMethodName" : "setClusterName",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "currentVersion",
+            "variableName" : "clusterName",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -9761,13 +11542,81 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The current version of the MSK cluster.</p>\n@param currentVersion The current version of the MSK cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The name of the MSK cluster.</p>\n         \n@param clusterName <p>The name of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "currentVersion",
+            "variableName" : "clusterName",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The name of the MSK cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "State" : {
+          "c2jName" : "State",
+          "c2jShape" : "ClusterState",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
+          "enumType" : "ClusterState",
+          "fluentSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "fluentSetterMethodName" : "withState",
+          "getterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@return <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+          "getterMethodName" : "getState",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "state",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "state",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "State",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+          "setterMethodName" : "setState",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "state",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "state",
             "variableType" : "String",
-            "documentation" : "<p>The current version of the MSK cluster.</p>",
+            "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -9776,24 +11625,27 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "ClusterArn" ],
-      "shapeName" : "DeleteClusterRequest",
+      "required" : null,
+      "shapeName" : "CreateClusterResult",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DeleteClusterRequest",
-        "variableName" : "deleteClusterRequest",
-        "variableType" : "DeleteClusterRequest",
+        "variableDeclarationType" : "CreateClusterResult",
+        "variableName" : "createClusterResult",
+        "variableType" : "CreateClusterResult",
         "documentation" : null,
-        "simpleType" : "DeleteClusterRequest",
-        "variableSetterType" : "DeleteClusterRequest"
+        "simpleType" : "CreateClusterResult",
+        "variableSetterType" : "CreateClusterResult"
       },
       "wrapper" : false
     },
-    "DeleteClusterResult" : {
-      "c2jName" : "DeleteClusterResponse",
+    "CreateConfigurationRequest" : {
+      "c2jName" : "CreateConfigurationRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -9809,17 +11661,24 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "CreateConfiguration",
+        "locationName" : null,
+        "requestUri" : "/v1/configurations",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "ClusterArn",
+        "c2jName" : "Description",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
+        "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return The Amazon Resource Name (ARN) of the cluster.*/",
-        "getterMethodName" : "getClusterArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDescription",
+        "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
+        "getterMethodName" : "getDescription",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -9834,11 +11693,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterArn",
+          "marshallLocationName" : "description",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterArn",
+          "unmarshallLocationName" : "description",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -9850,14 +11709,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ClusterArn",
+        "name" : "Description",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.*/",
-        "setterMethodName" : "setClusterArn",
+        "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
+        "setterMethodName" : "setDescription",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
+          "variableName" : "description",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -9866,27 +11725,176 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
+          "variableName" : "description",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "State",
-        "c2jShape" : "ClusterState",
+        "c2jName" : "KafkaVersions",
+        "c2jShape" : "__listOf__string",
         "deprecated" : false,
-        "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
-        "enumType" : "ClusterState",
-        "fluentSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
-        "fluentSetterMethodName" : "withState",
-        "getterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-        "getterMethodName" : "getState",
+        "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKafkaVersions",
+        "getterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@return <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+        "getterMethodName" : "getKafkaVersions",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "kafkaVersions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "kafkaVersions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "KafkaVersions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+        "setterMethodName" : "setKafkaVersions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "kafkaVersions",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "kafkaVersions",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Name",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+        "getterMethodName" : "getName",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -9901,11 +11909,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "state",
+          "marshallLocationName" : "name",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "state",
+          "unmarshallLocationName" : "name",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -9917,14 +11925,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "State",
+        "name" : "Name",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-        "setterMethodName" : "setState",
+        "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+        "setterMethodName" : "setName",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "state",
+          "variableName" : "name",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -9933,29 +11941,96 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "state",
+          "variableName" : "name",
           "variableType" : "String",
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ServerProperties",
+        "c2jShape" : "__blob",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServerProperties",
+        "getterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+        "getterMethodName" : "getServerProperties",
+        "getterModel" : {
+          "returnType" : "java.nio.ByteBuffer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "serverProperties",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "serverProperties",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.nio.ByteBuffer",
+        "marshallingType" : "BYTE_BUFFER",
+        "name" : "ServerProperties",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+        "setterMethodName" : "setServerProperties",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "serverProperties",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "serverProperties",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
+        },
+        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ClusterArn" : {
-          "c2jName" : "ClusterArn",
+        "Description" : {
+          "c2jName" : "Description",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return The Amazon Resource Name (ARN) of the cluster.*/",
-          "getterMethodName" : "getClusterArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDescription",
+          "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
+          "getterMethodName" : "getDescription",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -9970,11 +12045,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "clusterArn",
+            "marshallLocationName" : "description",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterArn",
+            "unmarshallLocationName" : "description",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -9986,14 +12061,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ClusterArn",
+          "name" : "Description",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.*/",
-          "setterMethodName" : "setClusterArn",
+          "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
+          "setterMethodName" : "setDescription",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
+            "variableName" : "description",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -10002,28 +12077,178 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) of the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
+            "variableName" : "description",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>",
+            "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "State" : {
-          "c2jName" : "State",
-          "c2jShape" : "ClusterState",
-          "deprecated" : false,
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
-          "enumType" : "ClusterState",
-          "fluentSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
-          "fluentSetterMethodName" : "withState",
-          "getterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-          "getterMethodName" : "getState",
+        "KafkaVersions" : {
+          "c2jName" : "KafkaVersions",
+          "c2jShape" : "__listOf__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKafkaVersions",
+          "getterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@return <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+          "getterMethodName" : "getKafkaVersions",
+          "getterModel" : {
+            "returnType" : "java.util.List<String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "kafkaVersions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "kafkaVersions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "KafkaVersions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+          "setterMethodName" : "setKafkaVersions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "kafkaVersions",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "kafkaVersions",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Name" : {
+          "c2jName" : "Name",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+          "getterMethodName" : "getName",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -10038,11 +12263,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "state",
+            "marshallLocationName" : "name",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "state",
+            "unmarshallLocationName" : "name",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -10054,14 +12279,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "State",
+          "name" : "Name",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@see ClusterState*/",
-          "setterMethodName" : "setState",
+          "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+          "setterMethodName" : "setName",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "state",
+            "variableName" : "name",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -10070,42 +12295,107 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@param state The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "state",
+            "variableName" : "name",
             "variableType" : "String",
-            "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>",
+            "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "ServerProperties" : {
+          "c2jName" : "ServerProperties",
+          "c2jShape" : "__blob",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServerProperties",
+          "getterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+          "getterMethodName" : "getServerProperties",
+          "getterModel" : {
+            "returnType" : "java.nio.ByteBuffer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "serverProperties",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "serverProperties",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.nio.ByteBuffer",
+          "marshallingType" : "BYTE_BUFFER",
+          "name" : "ServerProperties",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+          "setterMethodName" : "setServerProperties",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "serverProperties",
+            "variableType" : "java.nio.ByteBuffer",
+            "documentation" : "",
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "serverProperties",
+            "variableType" : "java.nio.ByteBuffer",
+            "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "DeleteClusterResult",
+      "required" : [ "ServerProperties", "KafkaVersions", "Name" ],
+      "shapeName" : "CreateConfigurationRequest",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
+      "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DeleteClusterResult",
-        "variableName" : "deleteClusterResult",
-        "variableType" : "DeleteClusterResult",
+        "variableDeclarationType" : "CreateConfigurationRequest",
+        "variableName" : "createConfigurationRequest",
+        "variableType" : "CreateConfigurationRequest",
         "documentation" : null,
-        "simpleType" : "DeleteClusterResult",
-        "variableSetterType" : "DeleteClusterResult"
+        "simpleType" : "CreateConfigurationRequest",
+        "variableSetterType" : "CreateConfigurationRequest"
       },
       "wrapper" : false
     },
-    "DescribeClusterRequest" : {
-      "c2jName" : "DescribeClusterRequest",
+    "CreateConfigurationResult" : {
+      "c2jName" : "CreateConfigurationResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -10121,24 +12411,17 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "DescribeCluster",
-        "locationName" : null,
-        "requestUri" : "/v1/clusters/{clusterArn}",
-        "target" : null,
-        "verb" : "GET",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ClusterArn",
+        "c2jName" : "Arn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "getterMethodName" : "getClusterArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+        "getterMethodName" : "getArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -10151,14 +12434,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
-          "marshallLocationName" : "clusterArn",
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "arn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterArn",
-          "uri" : true
+          "unmarshallLocationName" : "arn",
+          "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -10169,14 +12452,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ClusterArn",
+        "name" : "Arn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "setterMethodName" : "setClusterArn",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+        "setterMethodName" : "setArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
+          "variableName" : "arn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -10185,29 +12468,230 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
+          "variableName" : "arn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "CreationTime",
+        "c2jShape" : "__timestampIso8601",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
+        "getterMethodName" : "getCreationTime",
+        "getterModel" : {
+          "returnType" : "java.util.Date",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "creationTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "creationTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
+        "setterMethodName" : "setCreationTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : "iso8601",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "LatestRevision",
+        "c2jShape" : "ConfigurationRevision",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLatestRevision",
+        "getterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@return <p>Latest revision of the configuration.</p>*/",
+        "getterMethodName" : "getLatestRevision",
+        "getterModel" : {
+          "returnType" : "ConfigurationRevision",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "latestRevision",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "latestRevision",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "LatestRevision",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>*/",
+        "setterMethodName" : "setLatestRevision",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationRevision",
+          "variableName" : "latestRevision",
+          "variableType" : "ConfigurationRevision",
+          "documentation" : "",
+          "simpleType" : "ConfigurationRevision",
+          "variableSetterType" : "ConfigurationRevision"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationRevision",
+          "variableName" : "latestRevision",
+          "variableType" : "ConfigurationRevision",
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+          "simpleType" : "ConfigurationRevision",
+          "variableSetterType" : "ConfigurationRevision"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Name",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ClusterArn" : {
-          "c2jName" : "ClusterArn",
+        "Arn" : {
+          "c2jName" : "Arn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-          "getterMethodName" : "getClusterArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+          "getterMethodName" : "getArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -10220,14 +12704,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
-            "marshallLocationName" : "clusterArn",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "arn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterArn",
-            "uri" : true
+            "unmarshallLocationName" : "arn",
+            "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -10238,14 +12722,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ClusterArn",
+          "name" : "Arn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-          "setterMethodName" : "setClusterArn",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+          "setterMethodName" : "setArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
+            "variableName" : "arn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -10254,136 +12738,98 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
+            "variableName" : "arn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "ClusterArn" ],
-      "shapeName" : "DescribeClusterRequest",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "DescribeClusterRequest",
-        "variableName" : "describeClusterRequest",
-        "variableType" : "DescribeClusterRequest",
-        "documentation" : null,
-        "simpleType" : "DescribeClusterRequest",
-        "variableSetterType" : "DescribeClusterRequest"
-      },
-      "wrapper" : false
-    },
-    "DescribeClusterResult" : {
-      "c2jName" : "DescribeClusterResponse",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "ClusterInfo",
-        "c2jShape" : "ClusterInfo",
-        "deprecated" : false,
-        "documentation" : "<p>The cluster information.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The cluster information.</p>\n@param clusterInfo The cluster information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterInfo",
-        "getterDocumentation" : "/**<p>The cluster information.</p>\n@return The cluster information.*/",
-        "getterMethodName" : "getClusterInfo",
-        "getterModel" : {
-          "returnType" : "ClusterInfo",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterInfo",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "clusterInfo",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "ClusterInfo",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The cluster information.</p>\n@param clusterInfo The cluster information.*/",
-        "setterMethodName" : "setClusterInfo",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ClusterInfo",
-          "variableName" : "clusterInfo",
-          "variableType" : "ClusterInfo",
-          "documentation" : "",
-          "simpleType" : "ClusterInfo",
-          "variableSetterType" : "ClusterInfo"
         },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The cluster information.</p>\n@param clusterInfo The cluster information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ClusterInfo",
-          "variableName" : "clusterInfo",
-          "variableType" : "ClusterInfo",
-          "documentation" : "<p>The cluster information.</p>",
-          "simpleType" : "ClusterInfo",
-          "variableSetterType" : "ClusterInfo"
+        "CreationTime" : {
+          "c2jName" : "CreationTime",
+          "c2jShape" : "__timestampIso8601",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
+          "getterMethodName" : "getCreationTime",
+          "getterModel" : {
+            "returnType" : "java.util.Date",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
+          "setterMethodName" : "setCreationTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : "iso8601",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "ClusterInfo" : {
-          "c2jName" : "ClusterInfo",
-          "c2jShape" : "ClusterInfo",
+        "LatestRevision" : {
+          "c2jName" : "LatestRevision",
+          "c2jShape" : "ConfigurationRevision",
           "deprecated" : false,
-          "documentation" : "<p>The cluster information.</p>",
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The cluster information.</p>\n@param clusterInfo The cluster information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterInfo",
-          "getterDocumentation" : "/**<p>The cluster information.</p>\n@return The cluster information.*/",
-          "getterMethodName" : "getClusterInfo",
+          "fluentSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLatestRevision",
+          "getterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@return <p>Latest revision of the configuration.</p>*/",
+          "getterMethodName" : "getLatestRevision",
           "getterModel" : {
-            "returnType" : "ClusterInfo",
+            "returnType" : "ConfigurationRevision",
             "documentation" : null
           },
           "http" : {
@@ -10396,11 +12842,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "clusterInfo",
+            "marshallLocationName" : "latestRevision",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterInfo",
+            "unmarshallLocationName" : "latestRevision",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -10412,31 +12858,99 @@
           "mapModel" : null,
           "marshallingTargetClass" : "StructuredPojo",
           "marshallingType" : "STRUCTURED",
-          "name" : "ClusterInfo",
+          "name" : "LatestRevision",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The cluster information.</p>\n@param clusterInfo The cluster information.*/",
-          "setterMethodName" : "setClusterInfo",
+          "setterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>*/",
+          "setterMethodName" : "setLatestRevision",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ClusterInfo",
-            "variableName" : "clusterInfo",
-            "variableType" : "ClusterInfo",
+            "variableDeclarationType" : "ConfigurationRevision",
+            "variableName" : "latestRevision",
+            "variableType" : "ConfigurationRevision",
             "documentation" : "",
-            "simpleType" : "ClusterInfo",
-            "variableSetterType" : "ClusterInfo"
+            "simpleType" : "ConfigurationRevision",
+            "variableSetterType" : "ConfigurationRevision"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The cluster information.</p>\n@param clusterInfo The cluster information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ClusterInfo",
-            "variableName" : "clusterInfo",
-            "variableType" : "ClusterInfo",
-            "documentation" : "<p>The cluster information.</p>",
-            "simpleType" : "ClusterInfo",
-            "variableSetterType" : "ClusterInfo"
+            "variableDeclarationType" : "ConfigurationRevision",
+            "variableName" : "latestRevision",
+            "variableType" : "ConfigurationRevision",
+            "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+            "simpleType" : "ConfigurationRevision",
+            "variableSetterType" : "ConfigurationRevision"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Name" : {
+          "c2jName" : "Name",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         }
@@ -10444,7 +12958,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "DescribeClusterResult",
+      "shapeName" : "CreateConfigurationResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -10453,17 +12967,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DescribeClusterResult",
-        "variableName" : "describeClusterResult",
-        "variableType" : "DescribeClusterResult",
+        "variableDeclarationType" : "CreateConfigurationResult",
+        "variableName" : "createConfigurationResult",
+        "variableType" : "CreateConfigurationResult",
         "documentation" : null,
-        "simpleType" : "DescribeClusterResult",
-        "variableSetterType" : "DescribeClusterResult"
+        "simpleType" : "CreateConfigurationResult",
+        "variableSetterType" : "CreateConfigurationResult"
       },
       "wrapper" : false
     },
-    "DescribeConfigurationRequest" : {
-      "c2jName" : "DescribeConfigurationRequest",
+    "DeleteClusterRequest" : {
+      "c2jName" : "DeleteClusterRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -10480,23 +12994,23 @@
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : {
-        "action" : "DescribeConfiguration",
+        "action" : "DeleteCluster",
         "locationName" : null,
-        "requestUri" : "/v1/configurations/{arn}",
+        "requestUri" : "/v1/clusters/{clusterArn}",
         "target" : null,
-        "verb" : "GET",
+        "verb" : "DELETE",
         "xmlNameSpaceUri" : null
       },
       "members" : [ {
-        "c2jName" : "Arn",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
-        "getterMethodName" : "getArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -10511,11 +13025,11 @@
           "isStreaming" : false,
           "location" : "uri",
           "marshallLocation" : "PATH",
-          "marshallLocationName" : "arn",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "arn",
+          "unmarshallLocationName" : "clusterArn",
           "uri" : true
         },
         "idempotencyToken" : false,
@@ -10527,14 +13041,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Arn",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
-        "setterMethodName" : "setArn",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "arn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -10543,29 +13057,96 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "arn",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "CurrentVersion",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCurrentVersion",
+        "getterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@return <p>The current version of the MSK cluster.</p>*/",
+        "getterMethodName" : "getCurrentVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "currentVersion",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "currentVersion",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "CurrentVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>*/",
+        "setterMethodName" : "setCurrentVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "currentVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "currentVersion",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+          "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "Arn" : {
-          "c2jName" : "Arn",
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
-          "getterMethodName" : "getArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -10580,11 +13161,11 @@
             "isStreaming" : false,
             "location" : "uri",
             "marshallLocation" : "PATH",
-            "marshallLocationName" : "arn",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "arn",
+            "unmarshallLocationName" : "clusterArn",
             "uri" : true
           },
           "idempotencyToken" : false,
@@ -10596,14 +13177,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "Arn",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
-          "setterMethodName" : "setArn",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "arn",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -10612,13 +13193,81 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "arn",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "CurrentVersion" : {
+          "c2jName" : "CurrentVersion",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCurrentVersion",
+          "getterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@return <p>The current version of the MSK cluster.</p>*/",
+          "getterMethodName" : "getCurrentVersion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "currentVersion",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "currentVersion",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "CurrentVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>*/",
+          "setterMethodName" : "setCurrentVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "currentVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The current version of the MSK cluster.</p>\n         \n@param currentVersion <p>The current version of the MSK cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "currentVersion",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+            "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -10627,24 +13276,24 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "Arn" ],
-      "shapeName" : "DescribeConfigurationRequest",
+      "required" : [ "ClusterArn" ],
+      "shapeName" : "DeleteClusterRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DescribeConfigurationRequest",
-        "variableName" : "describeConfigurationRequest",
-        "variableType" : "DescribeConfigurationRequest",
+        "variableDeclarationType" : "DeleteClusterRequest",
+        "variableName" : "deleteClusterRequest",
+        "variableType" : "DeleteClusterRequest",
         "documentation" : null,
-        "simpleType" : "DescribeConfigurationRequest",
-        "variableSetterType" : "DescribeConfigurationRequest"
+        "simpleType" : "DeleteClusterRequest",
+        "variableSetterType" : "DeleteClusterRequest"
       },
       "wrapper" : false
     },
-    "DescribeConfigurationResult" : {
-      "c2jName" : "DescribeConfigurationResponse",
+    "DeleteClusterResult" : {
+      "c2jName" : "DeleteClusterResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -10662,15 +13311,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "Arn",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
-        "getterMethodName" : "getArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -10685,11 +13334,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "arn",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "arn",
+          "unmarshallLocationName" : "clusterArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -10701,14 +13350,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Arn",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
-        "setterMethodName" : "setArn",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "arn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -10717,29 +13366,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "arn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "CreationTime",
-        "c2jShape" : "__timestampIso8601",
+        "c2jName" : "State",
+        "c2jShape" : "ClusterState",
         "deprecated" : false,
-        "documentation" : "<p>The time when the configuration was created.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withCreationTime",
-        "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
-        "getterMethodName" : "getCreationTime",
+        "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
+        "enumType" : "ClusterState",
+        "fluentSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+        "fluentSetterMethodName" : "withState",
+        "getterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@return <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+        "getterMethodName" : "getState",
         "getterModel" : {
-          "returnType" : "java.util.Date",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -10752,11 +13401,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "creationTime",
+          "marshallLocationName" : "state",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "creationTime",
+          "unmarshallLocationName" : "state",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -10766,45 +13415,230 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "java.util.Date",
-        "marshallingType" : "DATE",
-        "name" : "CreationTime",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "State",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
-        "setterMethodName" : "setCreationTime",
+        "setterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+        "setterMethodName" : "setState",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
+          "variableDeclarationType" : "String",
+          "variableName" : "state",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
         "variable" : {
-          "timestampFormat" : "iso8601",
-          "variableDeclarationType" : "java.util.Date",
-          "variableName" : "creationTime",
-          "variableType" : "java.util.Date",
-          "documentation" : "<p>The time when the configuration was created.</p>",
-          "simpleType" : "Date",
-          "variableSetterType" : "java.util.Date"
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "state",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "Description",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The description of the configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withDescription",
-        "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
-        "getterMethodName" : "getDescription",
+      } ],
+      "membersAsMap" : {
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clusterArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "State" : {
+          "c2jName" : "State",
+          "c2jShape" : "ClusterState",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
+          "enumType" : "ClusterState",
+          "fluentSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "fluentSetterMethodName" : "withState",
+          "getterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@return <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+          "getterMethodName" : "getState",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "state",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "state",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "State",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@see ClusterState*/",
+          "setterMethodName" : "setState",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "state",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         \n@param state <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClusterState*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "state",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DeleteClusterResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DeleteClusterResult",
+        "variableName" : "deleteClusterResult",
+        "variableType" : "DeleteClusterResult",
+        "documentation" : null,
+        "simpleType" : "DeleteClusterResult",
+        "variableSetterType" : "DeleteClusterResult"
+      },
+      "wrapper" : false
+    },
+    "DescribeClusterOperationRequest" : {
+      "c2jName" : "DescribeClusterOperationRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DescribeClusterOperation",
+        "locationName" : null,
+        "requestUri" : "/v1/operations/{clusterOperationArn}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ClusterOperationArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterOperationArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>*/",
+        "getterMethodName" : "getClusterOperationArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -10817,14 +13651,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "description",
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "clusterOperationArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "description",
-          "uri" : false
+          "unmarshallLocationName" : "clusterOperationArn",
+          "uri" : true
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -10835,14 +13669,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Description",
+        "name" : "ClusterOperationArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
-        "setterMethodName" : "setDescription",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>*/",
+        "setterMethodName" : "setClusterOperationArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "description",
+          "variableName" : "clusterOperationArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -10851,178 +13685,136 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "description",
+          "variableName" : "clusterOperationArn",
           "variableType" : "String",
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "KafkaVersions",
-        "c2jShape" : "__listOf__string",
-        "deprecated" : false,
-        "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withKafkaVersions",
-        "getterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return The versions of Apache Kafka with which you can use this MSK configuration.*/",
-        "getterMethodName" : "getKafkaVersions",
-        "getterModel" : {
-          "returnType" : "java.util.List<String>",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "kafkaVersions",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "kafkaVersions",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "__string",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "String",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "String",
-            "marshallingType" : "STRING",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "member",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : true,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "member",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterOperationArn" : {
+          "c2jName" : "ClusterOperationArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterOperationArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>*/",
+          "getterMethodName" : "getClusterOperationArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
           },
-          "memberLocationName" : null,
-          "memberType" : "String",
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "clusterOperationArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterOperationArn",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
           "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterOperationArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>*/",
+          "setterMethodName" : "setClusterOperationArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterOperationArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
-          "simpleType" : "String",
-          "templateImplType" : "java.util.ArrayList<String>",
-          "templateType" : "java.util.List<String>"
-        },
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "KafkaVersions",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.*/",
-        "setterMethodName" : "setKafkaVersions",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "kafkaVersions",
-          "variableType" : "java.util.List<String>",
-          "documentation" : "",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "kafkaVersions",
-          "variableType" : "java.util.List<String>",
-          "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "LatestRevision",
-        "c2jShape" : "ConfigurationRevision",
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterOperationArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ClusterOperationArn" ],
+      "shapeName" : "DescribeClusterOperationRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeClusterOperationRequest",
+        "variableName" : "describeClusterOperationRequest",
+        "variableType" : "DescribeClusterOperationRequest",
+        "documentation" : null,
+        "simpleType" : "DescribeClusterOperationRequest",
+        "variableSetterType" : "DescribeClusterOperationRequest"
+      },
+      "wrapper" : false
+    },
+    "DescribeClusterOperationResult" : {
+      "c2jName" : "DescribeClusterOperationResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ClusterOperationInfo",
+        "c2jShape" : "ClusterOperationInfo",
         "deprecated" : false,
-        "documentation" : "<p>Latest revision of the configuration.</p>",
+        "documentation" : "\n            <p>Cluster operation information</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withLatestRevision",
-        "getterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@return Latest revision of the configuration.*/",
-        "getterMethodName" : "getLatestRevision",
+        "fluentSetterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@param clusterOperationInfo <p>Cluster operation information</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterOperationInfo",
+        "getterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@return <p>Cluster operation information</p>*/",
+        "getterMethodName" : "getClusterOperationInfo",
         "getterModel" : {
-          "returnType" : "ConfigurationRevision",
+          "returnType" : "ClusterOperationInfo",
           "documentation" : null
         },
         "http" : {
@@ -11035,11 +13827,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "latestRevision",
+          "marshallLocationName" : "clusterOperationInfo",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "latestRevision",
+          "unmarshallLocationName" : "clusterOperationInfo",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -11051,114 +13843,47 @@
         "mapModel" : null,
         "marshallingTargetClass" : "StructuredPojo",
         "marshallingType" : "STRUCTURED",
-        "name" : "LatestRevision",
+        "name" : "ClusterOperationInfo",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.*/",
-        "setterMethodName" : "setLatestRevision",
+        "setterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@param clusterOperationInfo <p>Cluster operation information</p>*/",
+        "setterMethodName" : "setClusterOperationInfo",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationRevision",
-          "variableName" : "latestRevision",
-          "variableType" : "ConfigurationRevision",
+          "variableDeclarationType" : "ClusterOperationInfo",
+          "variableName" : "clusterOperationInfo",
+          "variableType" : "ClusterOperationInfo",
           "documentation" : "",
-          "simpleType" : "ConfigurationRevision",
-          "variableSetterType" : "ConfigurationRevision"
+          "simpleType" : "ClusterOperationInfo",
+          "variableSetterType" : "ClusterOperationInfo"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ConfigurationRevision",
-          "variableName" : "latestRevision",
-          "variableType" : "ConfigurationRevision",
-          "documentation" : "<p>Latest revision of the configuration.</p>",
-          "simpleType" : "ConfigurationRevision",
-          "variableSetterType" : "ConfigurationRevision"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "Name",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The name of the configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withName",
-        "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-        "getterMethodName" : "getName",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "name",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "name",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Name",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-        "setterMethodName" : "setName",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "name",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@param clusterOperationInfo <p>Cluster operation information</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "name",
-          "variableType" : "String",
-          "documentation" : "<p>The name of the configuration.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "ClusterOperationInfo",
+          "variableName" : "clusterOperationInfo",
+          "variableType" : "ClusterOperationInfo",
+          "documentation" : "\n            <p>Cluster operation information</p>\n         ",
+          "simpleType" : "ClusterOperationInfo",
+          "variableSetterType" : "ClusterOperationInfo"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "Arn" : {
-          "c2jName" : "Arn",
-          "c2jShape" : "__string",
+        "ClusterOperationInfo" : {
+          "c2jName" : "ClusterOperationInfo",
+          "c2jShape" : "ClusterOperationInfo",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+          "documentation" : "\n            <p>Cluster operation information</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
-          "getterMethodName" : "getArn",
+          "fluentSetterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@param clusterOperationInfo <p>Cluster operation information</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterOperationInfo",
+          "getterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@return <p>Cluster operation information</p>*/",
+          "getterMethodName" : "getClusterOperationInfo",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "ClusterOperationInfo",
             "documentation" : null
           },
           "http" : {
@@ -11171,11 +13896,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "arn",
+            "marshallLocationName" : "clusterOperationInfo",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "arn",
+            "unmarshallLocationName" : "clusterOperationInfo",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -11185,114 +13910,162 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Arn",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ClusterOperationInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
-          "setterMethodName" : "setArn",
+          "setterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@param clusterOperationInfo <p>Cluster operation information</p>*/",
+          "setterMethodName" : "setClusterOperationInfo",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "arn",
-            "variableType" : "String",
+            "variableDeclarationType" : "ClusterOperationInfo",
+            "variableName" : "clusterOperationInfo",
+            "variableType" : "ClusterOperationInfo",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "ClusterOperationInfo",
+            "variableSetterType" : "ClusterOperationInfo"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Cluster operation information</p>\n         \n@param clusterOperationInfo <p>Cluster operation information</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "arn",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "ClusterOperationInfo",
+            "variableName" : "clusterOperationInfo",
+            "variableType" : "ClusterOperationInfo",
+            "documentation" : "\n            <p>Cluster operation information</p>\n         ",
+            "simpleType" : "ClusterOperationInfo",
+            "variableSetterType" : "ClusterOperationInfo"
           },
           "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "DescribeClusterOperationResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeClusterOperationResult",
+        "variableName" : "describeClusterOperationResult",
+        "variableType" : "DescribeClusterOperationResult",
+        "documentation" : null,
+        "simpleType" : "DescribeClusterOperationResult",
+        "variableSetterType" : "DescribeClusterOperationResult"
+      },
+      "wrapper" : false
+    },
+    "DescribeClusterRequest" : {
+      "c2jName" : "DescribeClusterRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "DescribeCluster",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters/{clusterArn}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ClusterArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
         },
-        "CreationTime" : {
-          "c2jName" : "CreationTime",
-          "c2jShape" : "__timestampIso8601",
-          "deprecated" : false,
-          "documentation" : "<p>The time when the configuration was created.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withCreationTime",
-          "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
-          "getterMethodName" : "getCreationTime",
-          "getterModel" : {
-            "returnType" : "java.util.Date",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "creationTime",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "creationTime",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "java.util.Date",
-          "marshallingType" : "DATE",
-          "name" : "CreationTime",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
-          "setterMethodName" : "setCreationTime",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Date",
-            "variableName" : "creationTime",
-            "variableType" : "java.util.Date",
-            "documentation" : "",
-            "simpleType" : "Date",
-            "variableSetterType" : "java.util.Date"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : "iso8601",
-            "variableDeclarationType" : "java.util.Date",
-            "variableName" : "creationTime",
-            "variableType" : "java.util.Date",
-            "documentation" : "<p>The time when the configuration was created.</p>",
-            "simpleType" : "Date",
-            "variableSetterType" : "java.util.Date"
-          },
-          "xmlNameSpaceUri" : null
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "clusterArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterArn",
+          "uri" : true
         },
-        "Description" : {
-          "c2jName" : "Description",
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withDescription",
-          "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
-          "getterMethodName" : "getDescription",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -11305,14 +14078,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "description",
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "description",
-            "uri" : false
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : true
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -11323,14 +14096,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "Description",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
-          "setterMethodName" : "setDescription",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "description",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -11339,180 +14112,136 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "description",
+            "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The description of the configuration.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ClusterArn" ],
+      "shapeName" : "DescribeClusterRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "DescribeClusterRequest",
+        "variableName" : "describeClusterRequest",
+        "variableType" : "DescribeClusterRequest",
+        "documentation" : null,
+        "simpleType" : "DescribeClusterRequest",
+        "variableSetterType" : "DescribeClusterRequest"
+      },
+      "wrapper" : false
+    },
+    "DescribeClusterResult" : {
+      "c2jName" : "DescribeClusterResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ClusterInfo",
+        "c2jShape" : "ClusterInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The cluster information.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@param clusterInfo <p>The cluster information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterInfo",
+        "getterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@return <p>The cluster information.</p>*/",
+        "getterMethodName" : "getClusterInfo",
+        "getterModel" : {
+          "returnType" : "ClusterInfo",
+          "documentation" : null
         },
-        "KafkaVersions" : {
-          "c2jName" : "KafkaVersions",
-          "c2jShape" : "__listOf__string",
-          "deprecated" : false,
-          "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withKafkaVersions",
-          "getterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return The versions of Apache Kafka with which you can use this MSK configuration.*/",
-          "getterMethodName" : "getKafkaVersions",
-          "getterModel" : {
-            "returnType" : "java.util.List<String>",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "kafkaVersions",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "kafkaVersions",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "__string",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "String",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "String",
-              "marshallingType" : "STRING",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : true,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "String",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : true,
-            "simpleType" : "String",
-            "templateImplType" : "java.util.ArrayList<String>",
-            "templateType" : "java.util.List<String>"
-          },
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "KafkaVersions",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.*/",
-          "setterMethodName" : "setKafkaVersions",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "kafkaVersions",
-            "variableType" : "java.util.List<String>",
-            "documentation" : "",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions The versions of Apache Kafka with which you can use this MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "kafkaVersions",
-            "variableType" : "java.util.List<String>",
-            "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
-          },
-          "xmlNameSpaceUri" : null
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterInfo",
+          "uri" : false
         },
-        "LatestRevision" : {
-          "c2jName" : "LatestRevision",
-          "c2jShape" : "ConfigurationRevision",
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ClusterInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@param clusterInfo <p>The cluster information.</p>*/",
+        "setterMethodName" : "setClusterInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ClusterInfo",
+          "variableName" : "clusterInfo",
+          "variableType" : "ClusterInfo",
+          "documentation" : "",
+          "simpleType" : "ClusterInfo",
+          "variableSetterType" : "ClusterInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@param clusterInfo <p>The cluster information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ClusterInfo",
+          "variableName" : "clusterInfo",
+          "variableType" : "ClusterInfo",
+          "documentation" : "\n            <p>The cluster information.</p>\n         ",
+          "simpleType" : "ClusterInfo",
+          "variableSetterType" : "ClusterInfo"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterInfo" : {
+          "c2jName" : "ClusterInfo",
+          "c2jShape" : "ClusterInfo",
           "deprecated" : false,
-          "documentation" : "<p>Latest revision of the configuration.</p>",
+          "documentation" : "\n            <p>The cluster information.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withLatestRevision",
-          "getterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@return Latest revision of the configuration.*/",
-          "getterMethodName" : "getLatestRevision",
+          "fluentSetterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@param clusterInfo <p>The cluster information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterInfo",
+          "getterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@return <p>The cluster information.</p>*/",
+          "getterMethodName" : "getClusterInfo",
           "getterModel" : {
-            "returnType" : "ConfigurationRevision",
+            "returnType" : "ClusterInfo",
             "documentation" : null
           },
           "http" : {
@@ -11525,11 +14254,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "latestRevision",
+            "marshallLocationName" : "clusterInfo",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "latestRevision",
+            "unmarshallLocationName" : "clusterInfo",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -11541,99 +14270,31 @@
           "mapModel" : null,
           "marshallingTargetClass" : "StructuredPojo",
           "marshallingType" : "STRUCTURED",
-          "name" : "LatestRevision",
+          "name" : "ClusterInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.*/",
-          "setterMethodName" : "setLatestRevision",
+          "setterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@param clusterInfo <p>The cluster information.</p>*/",
+          "setterMethodName" : "setClusterInfo",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationRevision",
-            "variableName" : "latestRevision",
-            "variableType" : "ConfigurationRevision",
+            "variableDeclarationType" : "ClusterInfo",
+            "variableName" : "clusterInfo",
+            "variableType" : "ClusterInfo",
             "documentation" : "",
-            "simpleType" : "ConfigurationRevision",
-            "variableSetterType" : "ConfigurationRevision"
+            "simpleType" : "ClusterInfo",
+            "variableSetterType" : "ClusterInfo"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Latest revision of the configuration.</p>\n@param latestRevision Latest revision of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The cluster information.</p>\n         \n@param clusterInfo <p>The cluster information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ConfigurationRevision",
-            "variableName" : "latestRevision",
-            "variableType" : "ConfigurationRevision",
-            "documentation" : "<p>Latest revision of the configuration.</p>",
-            "simpleType" : "ConfigurationRevision",
-            "variableSetterType" : "ConfigurationRevision"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "Name" : {
-          "c2jName" : "Name",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The name of the configuration.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withName",
-          "getterDocumentation" : "/**<p>The name of the configuration.</p>\n@return The name of the configuration.*/",
-          "getterMethodName" : "getName",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "name",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "name",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Name",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.*/",
-          "setterMethodName" : "setName",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "name",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The name of the configuration.</p>\n@param name The name of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "name",
-            "variableType" : "String",
-            "documentation" : "<p>The name of the configuration.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "ClusterInfo",
+            "variableName" : "clusterInfo",
+            "variableType" : "ClusterInfo",
+            "documentation" : "\n            <p>The cluster information.</p>\n         ",
+            "simpleType" : "ClusterInfo",
+            "variableSetterType" : "ClusterInfo"
           },
           "xmlNameSpaceUri" : null
         }
@@ -11641,7 +14302,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "DescribeConfigurationResult",
+      "shapeName" : "DescribeClusterResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -11650,17 +14311,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DescribeConfigurationResult",
-        "variableName" : "describeConfigurationResult",
-        "variableType" : "DescribeConfigurationResult",
+        "variableDeclarationType" : "DescribeClusterResult",
+        "variableName" : "describeClusterResult",
+        "variableType" : "DescribeClusterResult",
         "documentation" : null,
-        "simpleType" : "DescribeConfigurationResult",
-        "variableSetterType" : "DescribeConfigurationResult"
+        "simpleType" : "DescribeClusterResult",
+        "variableSetterType" : "DescribeClusterResult"
       },
       "wrapper" : false
     },
-    "DescribeConfigurationRevisionRequest" : {
-      "c2jName" : "DescribeConfigurationRevisionRequest",
+    "DescribeConfigurationRequest" : {
+      "c2jName" : "DescribeConfigurationRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -11677,9 +14338,9 @@
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : {
-        "action" : "DescribeConfigurationRevision",
+        "action" : "DescribeConfiguration",
         "locationName" : null,
-        "requestUri" : "/v1/configurations/{arn}/revisions/{revision}",
+        "requestUri" : "/v1/configurations/{arn}",
         "target" : null,
         "verb" : "GET",
         "xmlNameSpaceUri" : null
@@ -11688,11 +14349,11 @@
         "c2jName" : "Arn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
         "getterMethodName" : "getArn",
         "getterModel" : {
           "returnType" : "String",
@@ -11726,7 +14387,7 @@
         "marshallingType" : "STRING",
         "name" : "Arn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
         "setterMethodName" : "setArn",
         "setterModel" : {
           "timestampFormat" : null,
@@ -11740,95 +14401,28 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "arn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "Revision",
-        "c2jShape" : "__long",
-        "deprecated" : false,
-        "documentation" : "<p>A string that uniquely identifies a revision of an MSK configuration.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@param revision A string that uniquely identifies a revision of an MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withRevision",
-        "getterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@return A string that uniquely identifies a revision of an MSK configuration.*/",
-        "getterMethodName" : "getRevision",
-        "getterModel" : {
-          "returnType" : "Long",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
-          "marshallLocationName" : "revision",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "revision",
-          "uri" : true
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Long",
-        "marshallingType" : "LONG",
-        "name" : "Revision",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@param revision A string that uniquely identifies a revision of an MSK configuration.*/",
-        "setterMethodName" : "setRevision",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@param revision A string that uniquely identifies a revision of an MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "<p>A string that uniquely identifies a revision of an MSK configuration.</p>",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
         "Arn" : {
           "c2jName" : "Arn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
           "getterMethodName" : "getArn",
           "getterModel" : {
             "returnType" : "String",
@@ -11862,7 +14456,7 @@
           "marshallingType" : "STRING",
           "name" : "Arn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.*/",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
           "setterMethodName" : "setArn",
           "setterModel" : {
             "timestampFormat" : null,
@@ -11876,107 +14470,39 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@param arn The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "arn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        },
-        "Revision" : {
-          "c2jName" : "Revision",
-          "c2jShape" : "__long",
-          "deprecated" : false,
-          "documentation" : "<p>A string that uniquely identifies a revision of an MSK configuration.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@param revision A string that uniquely identifies a revision of an MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withRevision",
-          "getterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@return A string that uniquely identifies a revision of an MSK configuration.*/",
-          "getterMethodName" : "getRevision",
-          "getterModel" : {
-            "returnType" : "Long",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
-            "marshallLocationName" : "revision",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "revision",
-            "uri" : true
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Long",
-          "marshallingType" : "LONG",
-          "name" : "Revision",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@param revision A string that uniquely identifies a revision of an MSK configuration.*/",
-          "setterMethodName" : "setRevision",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
-            "documentation" : "",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@param revision A string that uniquely identifies a revision of an MSK configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
-            "documentation" : "<p>A string that uniquely identifies a revision of an MSK configuration.</p>",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
-          },
-          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "Revision", "Arn" ],
-      "shapeName" : "DescribeConfigurationRevisionRequest",
+      "required" : [ "Arn" ],
+      "shapeName" : "DescribeConfigurationRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DescribeConfigurationRevisionRequest",
-        "variableName" : "describeConfigurationRevisionRequest",
-        "variableType" : "DescribeConfigurationRevisionRequest",
+        "variableDeclarationType" : "DescribeConfigurationRequest",
+        "variableName" : "describeConfigurationRequest",
+        "variableType" : "DescribeConfigurationRequest",
         "documentation" : null,
-        "simpleType" : "DescribeConfigurationRevisionRequest",
-        "variableSetterType" : "DescribeConfigurationRevisionRequest"
+        "simpleType" : "DescribeConfigurationRequest",
+        "variableSetterType" : "DescribeConfigurationRequest"
       },
       "wrapper" : false
     },
-    "DescribeConfigurationRevisionResult" : {
-      "c2jName" : "DescribeConfigurationRevisionResponse",
+    "DescribeConfigurationResult" : {
+      "c2jName" : "DescribeConfigurationResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -11997,11 +14523,11 @@
         "c2jName" : "Arn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
         "getterMethodName" : "getArn",
         "getterModel" : {
           "returnType" : "String",
@@ -12035,7 +14561,7 @@
         "marshallingType" : "STRING",
         "name" : "Arn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
         "setterMethodName" : "setArn",
         "setterModel" : {
           "timestampFormat" : null,
@@ -12049,13 +14575,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "arn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -12064,11 +14590,11 @@
         "c2jName" : "CreationTime",
         "c2jShape" : "__timestampIso8601",
         "deprecated" : false,
-        "documentation" : "<p>The time when the configuration was created.</p>",
+        "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withCreationTime",
-        "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
+        "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
         "getterMethodName" : "getCreationTime",
         "getterModel" : {
           "returnType" : "java.util.Date",
@@ -12102,7 +14628,7 @@
         "marshallingType" : "DATE",
         "name" : "CreationTime",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
+        "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
         "setterMethodName" : "setCreationTime",
         "setterModel" : {
           "timestampFormat" : null,
@@ -12116,13 +14642,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : "iso8601",
           "variableDeclarationType" : "java.util.Date",
           "variableName" : "creationTime",
           "variableType" : "java.util.Date",
-          "documentation" : "<p>The time when the configuration was created.</p>",
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
           "simpleType" : "Date",
           "variableSetterType" : "java.util.Date"
         },
@@ -12131,11 +14657,11 @@
         "c2jName" : "Description",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The description of the configuration.</p>",
+        "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withDescription",
-        "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
+        "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
         "getterMethodName" : "getDescription",
         "getterModel" : {
           "returnType" : "String",
@@ -12169,7 +14695,7 @@
         "marshallingType" : "STRING",
         "name" : "Description",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
+        "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
         "setterMethodName" : "setDescription",
         "setterModel" : {
           "timestampFormat" : null,
@@ -12183,29 +14709,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "description",
           "variableType" : "String",
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "Revision",
-        "c2jShape" : "__long",
+        "c2jName" : "KafkaVersions",
+        "c2jShape" : "__listOf__string",
         "deprecated" : false,
-        "documentation" : "<p>The revision number.</p>",
+        "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withRevision",
-        "getterDocumentation" : "/**<p>The revision number.</p>\n@return The revision number.*/",
-        "getterMethodName" : "getRevision",
+        "fluentSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKafkaVersions",
+        "getterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@return <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+        "getterMethodName" : "getKafkaVersions",
         "getterModel" : {
-          "returnType" : "Long",
+          "returnType" : "java.util.List<String>",
           "documentation" : null
         },
         "http" : {
@@ -12218,79 +14744,161 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "revision",
+          "marshallLocationName" : "kafkaVersions",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "revision",
+          "unmarshallLocationName" : "kafkaVersions",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Long",
-        "marshallingType" : "LONG",
-        "name" : "Revision",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.*/",
-        "setterMethodName" : "setRevision",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "revision",
-          "variableType" : "Long",
-          "documentation" : "<p>The revision number.</p>",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "ServerProperties",
-        "c2jShape" : "__blob",
-        "deprecated" : false,
-        "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withServerProperties",
-        "getterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-        "getterMethodName" : "getServerProperties",
-        "getterModel" : {
-          "returnType" : "java.nio.ByteBuffer",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "serverProperties",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "serverProperties",
-          "uri" : false
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "KafkaVersions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+        "setterMethodName" : "setKafkaVersions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "kafkaVersions",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "kafkaVersions",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "LatestRevision",
+        "c2jShape" : "ConfigurationRevision",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLatestRevision",
+        "getterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@return <p>Latest revision of the configuration.</p>*/",
+        "getterMethodName" : "getLatestRevision",
+        "getterModel" : {
+          "returnType" : "ConfigurationRevision",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "latestRevision",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "latestRevision",
+          "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -12299,33 +14907,100 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "java.nio.ByteBuffer",
-        "marshallingType" : "BYTE_BUFFER",
-        "name" : "ServerProperties",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "LatestRevision",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-        "setterMethodName" : "setServerProperties",
+        "setterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>*/",
+        "setterMethodName" : "setLatestRevision",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.nio.ByteBuffer",
-          "variableName" : "serverProperties",
-          "variableType" : "java.nio.ByteBuffer",
+          "variableDeclarationType" : "ConfigurationRevision",
+          "variableName" : "latestRevision",
+          "variableType" : "ConfigurationRevision",
           "documentation" : "",
-          "simpleType" : "ByteBuffer",
-          "variableSetterType" : "java.nio.ByteBuffer"
+          "simpleType" : "ConfigurationRevision",
+          "variableSetterType" : "ConfigurationRevision"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationRevision",
+          "variableName" : "latestRevision",
+          "variableType" : "ConfigurationRevision",
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+          "simpleType" : "ConfigurationRevision",
+          "variableSetterType" : "ConfigurationRevision"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Name",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.nio.ByteBuffer",
-          "variableName" : "serverProperties",
-          "variableType" : "java.nio.ByteBuffer",
-          "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
-          "simpleType" : "ByteBuffer",
-          "variableSetterType" : "java.nio.ByteBuffer"
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
@@ -12334,11 +15009,11 @@
           "c2jName" : "Arn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return The Amazon Resource Name (ARN) of the configuration.*/",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
           "getterMethodName" : "getArn",
           "getterModel" : {
             "returnType" : "String",
@@ -12372,7 +15047,7 @@
           "marshallingType" : "STRING",
           "name" : "Arn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.*/",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
           "setterMethodName" : "setArn",
           "setterModel" : {
             "timestampFormat" : null,
@@ -12386,13 +15061,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the configuration.</p>\n@param arn The Amazon Resource Name (ARN) of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "arn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -12402,11 +15077,11 @@
           "c2jName" : "CreationTime",
           "c2jShape" : "__timestampIso8601",
           "deprecated" : false,
-          "documentation" : "<p>The time when the configuration was created.</p>",
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withCreationTime",
-          "getterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@return The time when the configuration was created.*/",
+          "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
           "getterMethodName" : "getCreationTime",
           "getterModel" : {
             "returnType" : "java.util.Date",
@@ -12440,7 +15115,7 @@
           "marshallingType" : "DATE",
           "name" : "CreationTime",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.*/",
+          "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
           "setterMethodName" : "setCreationTime",
           "setterModel" : {
             "timestampFormat" : null,
@@ -12454,13 +15129,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The time when the configuration was created.</p>\n@param creationTime The time when the configuration was created.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : "iso8601",
             "variableDeclarationType" : "java.util.Date",
             "variableName" : "creationTime",
             "variableType" : "java.util.Date",
-            "documentation" : "<p>The time when the configuration was created.</p>",
+            "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
             "simpleType" : "Date",
             "variableSetterType" : "java.util.Date"
           },
@@ -12470,11 +15145,11 @@
           "c2jName" : "Description",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The description of the configuration.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withDescription",
-          "getterDocumentation" : "/**<p>The description of the configuration.</p>\n@return The description of the configuration.*/",
+          "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
           "getterMethodName" : "getDescription",
           "getterModel" : {
             "returnType" : "String",
@@ -12508,7 +15183,7 @@
           "marshallingType" : "STRING",
           "name" : "Description",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.*/",
+          "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
           "setterMethodName" : "setDescription",
           "setterModel" : {
             "timestampFormat" : null,
@@ -12522,30 +15197,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The description of the configuration.</p>\n@param description The description of the configuration.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "description",
             "variableType" : "String",
-            "documentation" : "<p>The description of the configuration.</p>",
+            "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Revision" : {
-          "c2jName" : "Revision",
-          "c2jShape" : "__long",
+        "KafkaVersions" : {
+          "c2jName" : "KafkaVersions",
+          "c2jShape" : "__listOf__string",
           "deprecated" : false,
-          "documentation" : "<p>The revision number.</p>",
+          "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withRevision",
-          "getterDocumentation" : "/**<p>The revision number.</p>\n@return The revision number.*/",
-          "getterMethodName" : "getRevision",
+          "fluentSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKafkaVersions",
+          "getterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@return <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+          "getterMethodName" : "getKafkaVersions",
           "getterModel" : {
-            "returnType" : "Long",
+            "returnType" : "java.util.List<String>",
             "documentation" : null
           },
           "http" : {
@@ -12558,62 +15233,144 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "revision",
+            "marshallLocationName" : "kafkaVersions",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "revision",
+            "unmarshallLocationName" : "kafkaVersions",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Long",
-          "marshallingType" : "LONG",
-          "name" : "Revision",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.*/",
-          "setterMethodName" : "setRevision",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "KafkaVersions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>*/",
+          "setterMethodName" : "setKafkaVersions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "kafkaVersions",
+            "variableType" : "java.util.List<String>",
             "documentation" : "",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The revision number.</p>\n@param revision The revision number.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setKafkaVersions(java.util.Collection)} or {@link #withKafkaVersions(java.util.Collection)} if you want to override the existing values.</p>\n@param kafkaVersions <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Long",
-            "variableName" : "revision",
-            "variableType" : "Long",
-            "documentation" : "<p>The revision number.</p>",
-            "simpleType" : "Long",
-            "variableSetterType" : "Long"
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "kafkaVersions",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
           },
           "xmlNameSpaceUri" : null
         },
-        "ServerProperties" : {
-          "c2jName" : "ServerProperties",
-          "c2jShape" : "__blob",
+        "LatestRevision" : {
+          "c2jName" : "LatestRevision",
+          "c2jShape" : "ConfigurationRevision",
           "deprecated" : false,
-          "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withServerProperties",
-          "getterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-          "getterMethodName" : "getServerProperties",
+          "fluentSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLatestRevision",
+          "getterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@return <p>Latest revision of the configuration.</p>*/",
+          "getterMethodName" : "getLatestRevision",
           "getterModel" : {
-            "returnType" : "java.nio.ByteBuffer",
+            "returnType" : "ConfigurationRevision",
             "documentation" : null
           },
           "http" : {
@@ -12626,11 +15383,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "serverProperties",
+            "marshallLocationName" : "latestRevision",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "serverProperties",
+            "unmarshallLocationName" : "latestRevision",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -12640,33 +15397,101 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "java.nio.ByteBuffer",
-          "marshallingType" : "BYTE_BUFFER",
-          "name" : "ServerProperties",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "LatestRevision",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.*/",
-          "setterMethodName" : "setServerProperties",
+          "setterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>*/",
+          "setterMethodName" : "setLatestRevision",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.nio.ByteBuffer",
-            "variableName" : "serverProperties",
-            "variableType" : "java.nio.ByteBuffer",
+            "variableDeclarationType" : "ConfigurationRevision",
+            "variableName" : "latestRevision",
+            "variableType" : "ConfigurationRevision",
             "documentation" : "",
-            "simpleType" : "ByteBuffer",
-            "variableSetterType" : "java.nio.ByteBuffer"
+            "simpleType" : "ConfigurationRevision",
+            "variableSetterType" : "ConfigurationRevision"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Latest revision of the configuration.</p>\n         \n@param latestRevision <p>Latest revision of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationRevision",
+            "variableName" : "latestRevision",
+            "variableType" : "ConfigurationRevision",
+            "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         ",
+            "simpleType" : "ConfigurationRevision",
+            "variableSetterType" : "ConfigurationRevision"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Name" : {
+          "c2jName" : "Name",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@return <p>The name of the configuration.</p>*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>\n@param serverProperties Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The name of the configuration.</p>\n         \n@param name <p>The name of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.nio.ByteBuffer",
-            "variableName" : "serverProperties",
-            "variableType" : "java.nio.ByteBuffer",
-            "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>",
-            "simpleType" : "ByteBuffer",
-            "variableSetterType" : "java.nio.ByteBuffer"
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The name of the configuration.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         }
@@ -12674,7 +15499,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "DescribeConfigurationRevisionResult",
+      "shapeName" : "DescribeConfigurationResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -12683,17 +15508,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "DescribeConfigurationRevisionResult",
-        "variableName" : "describeConfigurationRevisionResult",
-        "variableType" : "DescribeConfigurationRevisionResult",
+        "variableDeclarationType" : "DescribeConfigurationResult",
+        "variableName" : "describeConfigurationResult",
+        "variableType" : "DescribeConfigurationResult",
         "documentation" : null,
-        "simpleType" : "DescribeConfigurationRevisionResult",
-        "variableSetterType" : "DescribeConfigurationRevisionResult"
+        "simpleType" : "DescribeConfigurationResult",
+        "variableSetterType" : "DescribeConfigurationResult"
       },
       "wrapper" : false
     },
-    "EBSStorageInfo" : {
-      "c2jName" : "EBSStorageInfo",
+    "DescribeConfigurationRevisionRequest" : {
+      "c2jName" : "DescribeConfigurationRevisionRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -12701,7 +15526,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Contains information about the EBS storage volumes attached to Kafka broker nodes.</p>",
+      "documentation" : "",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -12709,19 +15534,26 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "DescribeConfigurationRevision",
+        "locationName" : null,
+        "requestUri" : "/v1/configurations/{arn}/revisions/{revision}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "VolumeSize",
-        "c2jShape" : "__integerMin1Max16384",
+        "c2jName" : "Arn",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@param volumeSize The size in GiB of the EBS volume for the data drive on each broker node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withVolumeSize",
-        "getterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@return The size in GiB of the EBS volume for the data drive on each broker node.*/",
-        "getterMethodName" : "getVolumeSize",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+        "getterMethodName" : "getArn",
         "getterModel" : {
-          "returnType" : "Integer",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -12732,14 +15564,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "volumeSize",
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "arn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "volumeSize",
-          "uri" : false
+          "unmarshallLocationName" : "arn",
+          "uri" : true
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -12748,49 +15580,116 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "VolumeSize",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Arn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@param volumeSize The size in GiB of the EBS volume for the data drive on each broker node.*/",
-        "setterMethodName" : "setVolumeSize",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+        "setterMethodName" : "setArn",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "volumeSize",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "String",
+          "variableName" : "arn",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@param volumeSize The size in GiB of the EBS volume for the data drive on each broker node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "volumeSize",
-          "variableType" : "Integer",
-          "documentation" : "<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "String",
+          "variableName" : "arn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Revision",
+        "c2jShape" : "__long",
+        "deprecated" : false,
+        "documentation" : "\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@param revision <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRevision",
+        "getterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@return <p>A string that uniquely identifies a revision of an MSK configuration.</p>*/",
+        "getterMethodName" : "getRevision",
+        "getterModel" : {
+          "returnType" : "Long",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "revision",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "revision",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "Revision",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@param revision <p>A string that uniquely identifies a revision of an MSK configuration.</p>*/",
+        "setterMethodName" : "setRevision",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
+          "documentation" : "",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@param revision <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
+          "documentation" : "\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         ",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "VolumeSize" : {
-          "c2jName" : "VolumeSize",
-          "c2jShape" : "__integerMin1Max16384",
+        "Arn" : {
+          "c2jName" : "Arn",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@param volumeSize The size in GiB of the EBS volume for the data drive on each broker node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withVolumeSize",
-          "getterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@return The size in GiB of the EBS volume for the data drive on each broker node.*/",
-          "getterMethodName" : "getVolumeSize",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+          "getterMethodName" : "getArn",
           "getterModel" : {
-            "returnType" : "Integer",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -12801,14 +15700,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "volumeSize",
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "arn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "volumeSize",
-            "uri" : false
+            "unmarshallLocationName" : "arn",
+            "uri" : true
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -12817,60 +15716,125 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "VolumeSize",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Arn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@param volumeSize The size in GiB of the EBS volume for the data drive on each broker node.*/",
-          "setterMethodName" : "setVolumeSize",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+          "setterMethodName" : "setArn",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "volumeSize",
-            "variableType" : "Integer",
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@param volumeSize The size in GiB of the EBS volume for the data drive on each broker node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "volumeSize",
-            "variableType" : "Integer",
-            "documentation" : "<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Revision" : {
+          "c2jName" : "Revision",
+          "c2jShape" : "__long",
+          "deprecated" : false,
+          "documentation" : "\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@param revision <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRevision",
+          "getterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@return <p>A string that uniquely identifies a revision of an MSK configuration.</p>*/",
+          "getterMethodName" : "getRevision",
+          "getterModel" : {
+            "returnType" : "Long",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "revision",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "revision",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "Revision",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@param revision <p>A string that uniquely identifies a revision of an MSK configuration.</p>*/",
+          "setterMethodName" : "setRevision",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         \n@param revision <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         ",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "EBSStorageInfo",
+      "required" : [ "Revision", "Arn" ],
+      "shapeName" : "DescribeConfigurationRevisionRequest",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
+      "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "EBSStorageInfo",
-        "variableName" : "eBSStorageInfo",
-        "variableType" : "EBSStorageInfo",
+        "variableDeclarationType" : "DescribeConfigurationRevisionRequest",
+        "variableName" : "describeConfigurationRevisionRequest",
+        "variableType" : "DescribeConfigurationRevisionRequest",
         "documentation" : null,
-        "simpleType" : "EBSStorageInfo",
-        "variableSetterType" : "EBSStorageInfo"
+        "simpleType" : "DescribeConfigurationRevisionRequest",
+        "variableSetterType" : "DescribeConfigurationRevisionRequest"
       },
       "wrapper" : false
     },
-    "EncryptionAtRest" : {
-      "c2jName" : "EncryptionAtRest",
+    "DescribeConfigurationRevisionResult" : {
+      "c2jName" : "DescribeConfigurationRevisionResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -12878,7 +15842,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>The data volume encryption details.</p>",
+      "documentation" : "",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -12888,15 +15852,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "DataVolumeKMSKeyId",
+        "c2jName" : "Arn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The AWS KMS key used for data encryption.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@param dataVolumeKMSKeyId The AWS KMS key used for data encryption.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withDataVolumeKMSKeyId",
-        "getterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@return The AWS KMS key used for data encryption.*/",
-        "getterMethodName" : "getDataVolumeKMSKeyId",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+        "getterMethodName" : "getArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -12911,11 +15875,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "dataVolumeKMSKeyId",
+          "marshallLocationName" : "arn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "dataVolumeKMSKeyId",
+          "unmarshallLocationName" : "arn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -12927,14 +15891,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "DataVolumeKMSKeyId",
+        "name" : "Arn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@param dataVolumeKMSKeyId The AWS KMS key used for data encryption.*/",
-        "setterMethodName" : "setDataVolumeKMSKeyId",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+        "setterMethodName" : "setArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "dataVolumeKMSKeyId",
+          "variableName" : "arn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -12943,139 +15907,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@param dataVolumeKMSKeyId The AWS KMS key used for data encryption.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "dataVolumeKMSKeyId",
+          "variableName" : "arn",
           "variableType" : "String",
-          "documentation" : "<p>The AWS KMS key used for data encryption.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "DataVolumeKMSKeyId" : {
-          "c2jName" : "DataVolumeKMSKeyId",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The AWS KMS key used for data encryption.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@param dataVolumeKMSKeyId The AWS KMS key used for data encryption.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withDataVolumeKMSKeyId",
-          "getterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@return The AWS KMS key used for data encryption.*/",
-          "getterMethodName" : "getDataVolumeKMSKeyId",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "dataVolumeKMSKeyId",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "dataVolumeKMSKeyId",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "DataVolumeKMSKeyId",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@param dataVolumeKMSKeyId The AWS KMS key used for data encryption.*/",
-          "setterMethodName" : "setDataVolumeKMSKeyId",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "dataVolumeKMSKeyId",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The AWS KMS key used for data encryption.</p>\n@param dataVolumeKMSKeyId The AWS KMS key used for data encryption.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "dataVolumeKMSKeyId",
-            "variableType" : "String",
-            "documentation" : "<p>The AWS KMS key used for data encryption.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "DataVolumeKMSKeyId" ],
-      "shapeName" : "EncryptionAtRest",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "EncryptionAtRest",
-        "variableName" : "encryptionAtRest",
-        "variableType" : "EncryptionAtRest",
-        "documentation" : null,
-        "simpleType" : "EncryptionAtRest",
-        "variableSetterType" : "EncryptionAtRest"
-      },
-      "wrapper" : false
-    },
-    "EncryptionInfo" : {
-      "c2jName" : "EncryptionInfo",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Includes encryption-related information, such as the AWS KMS key used for encrypting data at rest.</p>",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "EncryptionAtRest",
-        "c2jShape" : "EncryptionAtRest",
+      }, {
+        "c2jName" : "CreationTime",
+        "c2jShape" : "__timestampIso8601",
         "deprecated" : false,
-        "documentation" : "<p>The data volume encryption details.</p>",
+        "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The data volume encryption details.</p>\n@param encryptionAtRest The data volume encryption details.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withEncryptionAtRest",
-        "getterDocumentation" : "/**<p>The data volume encryption details.</p>\n@return The data volume encryption details.*/",
-        "getterMethodName" : "getEncryptionAtRest",
+        "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCreationTime",
+        "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
+        "getterMethodName" : "getCreationTime",
         "getterModel" : {
-          "returnType" : "EncryptionAtRest",
+          "returnType" : "java.util.Date",
           "documentation" : null
         },
         "http" : {
@@ -13088,11 +15942,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "encryptionAtRest",
+          "marshallLocationName" : "creationTime",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "encryptionAtRest",
+          "unmarshallLocationName" : "creationTime",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -13102,205 +15956,45 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "EncryptionAtRest",
+        "marshallingTargetClass" : "java.util.Date",
+        "marshallingType" : "DATE",
+        "name" : "CreationTime",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The data volume encryption details.</p>\n@param encryptionAtRest The data volume encryption details.*/",
-        "setterMethodName" : "setEncryptionAtRest",
+        "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
+        "setterMethodName" : "setCreationTime",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "EncryptionAtRest",
-          "variableName" : "encryptionAtRest",
-          "variableType" : "EncryptionAtRest",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
           "documentation" : "",
-          "simpleType" : "EncryptionAtRest",
-          "variableSetterType" : "EncryptionAtRest"
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The data volume encryption details.</p>\n@param encryptionAtRest The data volume encryption details.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "EncryptionAtRest",
-          "variableName" : "encryptionAtRest",
-          "variableType" : "EncryptionAtRest",
-          "documentation" : "<p>The data volume encryption details.</p>",
-          "simpleType" : "EncryptionAtRest",
-          "variableSetterType" : "EncryptionAtRest"
+          "timestampFormat" : "iso8601",
+          "variableDeclarationType" : "java.util.Date",
+          "variableName" : "creationTime",
+          "variableType" : "java.util.Date",
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+          "simpleType" : "Date",
+          "variableSetterType" : "java.util.Date"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "EncryptionAtRest" : {
-          "c2jName" : "EncryptionAtRest",
-          "c2jShape" : "EncryptionAtRest",
-          "deprecated" : false,
-          "documentation" : "<p>The data volume encryption details.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The data volume encryption details.</p>\n@param encryptionAtRest The data volume encryption details.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withEncryptionAtRest",
-          "getterDocumentation" : "/**<p>The data volume encryption details.</p>\n@return The data volume encryption details.*/",
-          "getterMethodName" : "getEncryptionAtRest",
-          "getterModel" : {
-            "returnType" : "EncryptionAtRest",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "encryptionAtRest",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "encryptionAtRest",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "EncryptionAtRest",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The data volume encryption details.</p>\n@param encryptionAtRest The data volume encryption details.*/",
-          "setterMethodName" : "setEncryptionAtRest",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "EncryptionAtRest",
-            "variableName" : "encryptionAtRest",
-            "variableType" : "EncryptionAtRest",
-            "documentation" : "",
-            "simpleType" : "EncryptionAtRest",
-            "variableSetterType" : "EncryptionAtRest"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The data volume encryption details.</p>\n@param encryptionAtRest The data volume encryption details.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "EncryptionAtRest",
-            "variableName" : "encryptionAtRest",
-            "variableType" : "EncryptionAtRest",
-            "documentation" : "<p>The data volume encryption details.</p>",
-            "simpleType" : "EncryptionAtRest",
-            "variableSetterType" : "EncryptionAtRest"
-          },
-          "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "EncryptionInfo",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "EncryptionInfo",
-        "variableName" : "encryptionInfo",
-        "variableType" : "EncryptionInfo",
-        "documentation" : null,
-        "simpleType" : "EncryptionInfo",
-        "variableSetterType" : "EncryptionInfo"
-      },
-      "wrapper" : false
-    },
-    "EnhancedMonitoring" : {
-      "c2jName" : "EnhancedMonitoring",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
-      "enums" : [ {
-        "name" : "DEFAULT",
-        "value" : "DEFAULT"
-      }, {
-        "name" : "PER_BROKER",
-        "value" : "PER_BROKER"
       }, {
-        "name" : "PER_TOPIC_PER_BROKER",
-        "value" : "PER_TOPIC_PER_BROKER"
-      } ],
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "EnhancedMonitoring",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "EnhancedMonitoring",
-        "variableName" : "enhancedMonitoring",
-        "variableType" : "EnhancedMonitoring",
-        "documentation" : null,
-        "simpleType" : "EnhancedMonitoring",
-        "variableSetterType" : "EnhancedMonitoring"
-      },
-      "wrapper" : false
-    },
-    "ForbiddenException" : {
-      "c2jName" : "ForbiddenException",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
-      "enums" : null,
-      "errorCode" : "ForbiddenException",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "InvalidParameter",
+        "c2jName" : "Description",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
+        "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-        "getterMethodName" : "getInvalidParameter",
+        "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDescription",
+        "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
+        "getterMethodName" : "getDescription",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -13315,11 +16009,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "invalidParameter",
+          "marshallLocationName" : "description",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "invalidParameter",
+          "unmarshallLocationName" : "description",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -13331,14 +16025,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "InvalidParameter",
+        "name" : "Description",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-        "setterMethodName" : "setInvalidParameter",
+        "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
+        "setterMethodName" : "setDescription",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
+          "variableName" : "description",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -13347,29 +16041,163 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
+          "variableName" : "description",
           "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Revision",
+        "c2jShape" : "__long",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The revision number.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRevision",
+        "getterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@return <p>The revision number.</p>*/",
+        "getterMethodName" : "getRevision",
+        "getterModel" : {
+          "returnType" : "Long",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "revision",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "revision",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "Revision",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>*/",
+        "setterMethodName" : "setRevision",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
+          "documentation" : "",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "revision",
+          "variableType" : "Long",
+          "documentation" : "\n            <p>The revision number.</p>\n         ",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ServerProperties",
+        "c2jShape" : "__blob",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServerProperties",
+        "getterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+        "getterMethodName" : "getServerProperties",
+        "getterModel" : {
+          "returnType" : "java.nio.ByteBuffer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "serverProperties",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "serverProperties",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "java.nio.ByteBuffer",
+        "marshallingType" : "BYTE_BUFFER",
+        "name" : "ServerProperties",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+        "setterMethodName" : "setServerProperties",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "serverProperties",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "serverProperties",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
+        },
+        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "InvalidParameter" : {
-          "c2jName" : "InvalidParameter",
+        "Arn" : {
+          "c2jName" : "Arn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-          "getterMethodName" : "getInvalidParameter",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+          "getterMethodName" : "getArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -13384,11 +16212,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "invalidParameter",
+            "marshallLocationName" : "arn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "invalidParameter",
+            "unmarshallLocationName" : "arn",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -13400,14 +16228,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "InvalidParameter",
+          "name" : "Arn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-          "setterMethodName" : "setInvalidParameter",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>*/",
+          "setterMethodName" : "setArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
+            "variableName" : "arn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -13416,143 +16244,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
+            "variableName" : "arn",
             "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ForbiddenException",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ForbiddenException",
-        "variableName" : "forbiddenException",
-        "variableType" : "ForbiddenException",
-        "documentation" : null,
-        "simpleType" : "ForbiddenException",
-        "variableSetterType" : "ForbiddenException"
-      },
-      "wrapper" : false
-    },
-    "GetBootstrapBrokersRequest" : {
-      "c2jName" : "GetBootstrapBrokersRequest",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "GetBootstrapBrokers",
-        "locationName" : null,
-        "requestUri" : "/v1/clusters/{clusterArn}/bootstrap-brokers",
-        "target" : null,
-        "verb" : "GET",
-        "xmlNameSpaceUri" : null
-      },
-      "members" : [ {
-        "c2jName" : "ClusterArn",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "getterMethodName" : "getClusterArn",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
-          "marshallLocationName" : "clusterArn",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "clusterArn",
-          "uri" : true
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "ClusterArn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "setterMethodName" : "setClusterArn",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
-          "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "ClusterArn" : {
-          "c2jName" : "ClusterArn",
-          "c2jShape" : "__string",
+        "CreationTime" : {
+          "c2jName" : "CreationTime",
+          "c2jShape" : "__timestampIso8601",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-          "getterMethodName" : "getClusterArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCreationTime",
+          "getterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@return <p>The time when the configuration was created.</p>*/",
+          "getterMethodName" : "getCreationTime",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "java.util.Date",
             "documentation" : null
           },
           "http" : {
@@ -13563,14 +16278,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
-            "marshallLocationName" : "clusterArn",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "creationTime",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterArn",
-            "uri" : true
+            "unmarshallLocationName" : "creationTime",
+            "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -13579,152 +16294,46 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "ClusterArn",
+          "marshallingTargetClass" : "java.util.Date",
+          "marshallingType" : "DATE",
+          "name" : "CreationTime",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-          "setterMethodName" : "setClusterArn",
+          "setterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>*/",
+          "setterMethodName" : "setCreationTime",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
-            "variableType" : "String",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The time when the configuration was created.</p>\n         \n@param creationTime <p>The time when the configuration was created.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "timestampFormat" : "iso8601",
+            "variableDeclarationType" : "java.util.Date",
+            "variableName" : "creationTime",
+            "variableType" : "java.util.Date",
+            "documentation" : "\n            <p>The time when the configuration was created.</p>\n         ",
+            "simpleType" : "Date",
+            "variableSetterType" : "java.util.Date"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "ClusterArn" ],
-      "shapeName" : "GetBootstrapBrokersRequest",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "GetBootstrapBrokersRequest",
-        "variableName" : "getBootstrapBrokersRequest",
-        "variableType" : "GetBootstrapBrokersRequest",
-        "documentation" : null,
-        "simpleType" : "GetBootstrapBrokersRequest",
-        "variableSetterType" : "GetBootstrapBrokersRequest"
-      },
-      "wrapper" : false
-    },
-    "GetBootstrapBrokersResult" : {
-      "c2jName" : "GetBootstrapBrokersResponse",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "BootstrapBrokerString",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>A string containing one or more hostname:port pairs.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@param bootstrapBrokerString A string containing one or more hostname:port pairs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withBootstrapBrokerString",
-        "getterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@return A string containing one or more hostname:port pairs.*/",
-        "getterMethodName" : "getBootstrapBrokerString",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "bootstrapBrokerString",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "bootstrapBrokerString",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "BootstrapBrokerString",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@param bootstrapBrokerString A string containing one or more hostname:port pairs.*/",
-        "setterMethodName" : "setBootstrapBrokerString",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "bootstrapBrokerString",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@param bootstrapBrokerString A string containing one or more hostname:port pairs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "bootstrapBrokerString",
-          "variableType" : "String",
-          "documentation" : "<p>A string containing one or more hostname:port pairs.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "BootstrapBrokerString" : {
-          "c2jName" : "BootstrapBrokerString",
+        "Description" : {
+          "c2jName" : "Description",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>A string containing one or more hostname:port pairs.</p>",
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@param bootstrapBrokerString A string containing one or more hostname:port pairs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withBootstrapBrokerString",
-          "getterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@return A string containing one or more hostname:port pairs.*/",
-          "getterMethodName" : "getBootstrapBrokerString",
+          "fluentSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDescription",
+          "getterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@return <p>The description of the configuration.</p>*/",
+          "getterMethodName" : "getDescription",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -13739,11 +16348,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "bootstrapBrokerString",
+            "marshallLocationName" : "description",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "bootstrapBrokerString",
+            "unmarshallLocationName" : "description",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -13755,14 +16364,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "BootstrapBrokerString",
+          "name" : "Description",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@param bootstrapBrokerString A string containing one or more hostname:port pairs.*/",
-          "setterMethodName" : "setBootstrapBrokerString",
+          "setterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>*/",
+          "setterMethodName" : "setDescription",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "bootstrapBrokerString",
+            "variableName" : "description",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -13771,139 +16380,98 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>A string containing one or more hostname:port pairs.</p>\n@param bootstrapBrokerString A string containing one or more hostname:port pairs.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The description of the configuration.</p>\n         \n@param description <p>The description of the configuration.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "bootstrapBrokerString",
+            "variableName" : "description",
             "variableType" : "String",
-            "documentation" : "<p>A string containing one or more hostname:port pairs.</p>",
+            "documentation" : "\n            <p>The description of the configuration.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "GetBootstrapBrokersResult",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "GetBootstrapBrokersResult",
-        "variableName" : "getBootstrapBrokersResult",
-        "variableType" : "GetBootstrapBrokersResult",
-        "documentation" : null,
-        "simpleType" : "GetBootstrapBrokersResult",
-        "variableSetterType" : "GetBootstrapBrokersResult"
-      },
-      "wrapper" : false
-    },
-    "InternalServerErrorException" : {
-      "c2jName" : "InternalServerErrorException",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
-      "enums" : null,
-      "errorCode" : "InternalServerErrorException",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ {
-        "c2jName" : "InvalidParameter",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-        "getterMethodName" : "getInvalidParameter",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "invalidParameter",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "invalidParameter",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "InvalidParameter",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-        "setterMethodName" : "setInvalidParameter",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
         },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
-          "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+        "Revision" : {
+          "c2jName" : "Revision",
+          "c2jShape" : "__long",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The revision number.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRevision",
+          "getterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@return <p>The revision number.</p>*/",
+          "getterMethodName" : "getRevision",
+          "getterModel" : {
+            "returnType" : "Long",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "revision",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "revision",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "Revision",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>*/",
+          "setterMethodName" : "setRevision",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The revision number.</p>\n         \n@param revision <p>The revision number.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "revision",
+            "variableType" : "Long",
+            "documentation" : "\n            <p>The revision number.</p>\n         ",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "InvalidParameter" : {
-          "c2jName" : "InvalidParameter",
-          "c2jShape" : "__string",
+        "ServerProperties" : {
+          "c2jName" : "ServerProperties",
+          "c2jShape" : "__blob",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-          "getterMethodName" : "getInvalidParameter",
+          "fluentSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServerProperties",
+          "getterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+          "getterMethodName" : "getServerProperties",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "java.nio.ByteBuffer",
             "documentation" : null
           },
           "http" : {
@@ -13916,11 +16484,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "invalidParameter",
+            "marshallLocationName" : "serverProperties",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "invalidParameter",
+            "unmarshallLocationName" : "serverProperties",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -13930,33 +16498,33 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "InvalidParameter",
+          "marshallingTargetClass" : "java.nio.ByteBuffer",
+          "marshallingType" : "BYTE_BUFFER",
+          "name" : "ServerProperties",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-          "setterMethodName" : "setInvalidParameter",
+          "setterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         <p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>*/",
+          "setterMethodName" : "setServerProperties",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
-            "variableType" : "String",
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "serverProperties",
+            "variableType" : "java.nio.ByteBuffer",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         \n@param serverProperties <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
-            "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "serverProperties",
+            "variableType" : "java.nio.ByteBuffer",
+            "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         ",
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
           },
           "xmlNameSpaceUri" : null
         }
@@ -13964,23 +16532,26 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "InternalServerErrorException",
+      "shapeName" : "DescribeConfigurationRevisionResult",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "InternalServerErrorException",
-        "variableName" : "internalServerErrorException",
-        "variableType" : "InternalServerErrorException",
+        "variableDeclarationType" : "DescribeConfigurationRevisionResult",
+        "variableName" : "describeConfigurationRevisionResult",
+        "variableType" : "DescribeConfigurationRevisionResult",
         "documentation" : null,
-        "simpleType" : "InternalServerErrorException",
-        "variableSetterType" : "InternalServerErrorException"
+        "simpleType" : "DescribeConfigurationRevisionResult",
+        "variableSetterType" : "DescribeConfigurationRevisionResult"
       },
       "wrapper" : false
     },
-    "ListClustersRequest" : {
-      "c2jName" : "ListClustersRequest",
+    "EBSStorageInfo" : {
+      "c2jName" : "EBSStorageInfo",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -13988,7 +16559,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>Contains information about the EBS storage volumes attached to Kafka broker nodes.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -13996,26 +16567,19 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "ListClusters",
-        "locationName" : null,
-        "requestUri" : "/v1/clusters",
-        "target" : null,
-        "verb" : "GET",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ClusterNameFilter",
-        "c2jShape" : "__string",
+        "c2jName" : "VolumeSize",
+        "c2jShape" : "__integerMin1Max16384",
         "deprecated" : false,
-        "documentation" : "<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>",
+        "documentation" : "\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@param clusterNameFilter Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterNameFilter",
-        "getterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@return Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.*/",
-        "getterMethodName" : "getClusterNameFilter",
+        "fluentSetterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@param volumeSize <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withVolumeSize",
+        "getterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@return <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>*/",
+        "getterMethodName" : "getVolumeSize",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "Integer",
           "documentation" : null
         },
         "http" : {
@@ -14026,13 +16590,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "clusterNameFilter",
-          "queryString" : true,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "volumeSize",
+          "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterNameFilter",
+          "unmarshallLocationName" : "volumeSize",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -14042,112 +16606,155 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "ClusterNameFilter",
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "VolumeSize",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@param clusterNameFilter Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.*/",
-        "setterMethodName" : "setClusterNameFilter",
+        "setterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@param volumeSize <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>*/",
+        "setterMethodName" : "setVolumeSize",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterNameFilter",
-          "variableType" : "String",
+          "variableDeclarationType" : "Integer",
+          "variableName" : "volumeSize",
+          "variableType" : "Integer",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@param clusterNameFilter Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@param volumeSize <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clusterNameFilter",
-          "variableType" : "String",
-          "documentation" : "<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "Integer",
+          "variableName" : "volumeSize",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "MaxResults",
-        "c2jShape" : "MaxResults",
-        "deprecated" : false,
-        "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withMaxResults",
-        "getterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@return The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-        "getterMethodName" : "getMaxResults",
-        "getterModel" : {
-          "returnType" : "Integer",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "maxResults",
-          "queryString" : true,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "maxResults",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "MaxResults",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-        "setterMethodName" : "setMaxResults",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "maxResults",
-          "variableType" : "Integer",
-          "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "maxResults",
-          "variableType" : "Integer",
-          "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "NextToken",
+      } ],
+      "membersAsMap" : {
+        "VolumeSize" : {
+          "c2jName" : "VolumeSize",
+          "c2jShape" : "__integerMin1Max16384",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@param volumeSize <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withVolumeSize",
+          "getterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@return <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>*/",
+          "getterMethodName" : "getVolumeSize",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "volumeSize",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "volumeSize",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "VolumeSize",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@param volumeSize <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>*/",
+          "setterMethodName" : "setVolumeSize",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "volumeSize",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         \n@param volumeSize <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "volumeSize",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "EBSStorageInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "EBSStorageInfo",
+        "variableName" : "eBSStorageInfo",
+        "variableType" : "EBSStorageInfo",
+        "documentation" : null,
+        "simpleType" : "EBSStorageInfo",
+        "variableSetterType" : "EBSStorageInfo"
+      },
+      "wrapper" : false
+    },
+    "EncryptionAtRest" : {
+      "c2jName" : "EncryptionAtRest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>The data-volume encryption details.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "DataVolumeKMSKeyId",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+        "documentation" : "\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-        "getterMethodName" : "getNextToken",
+        "fluentSetterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@param dataVolumeKMSKeyId <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDataVolumeKMSKeyId",
+        "getterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@return <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>*/",
+        "getterMethodName" : "getDataVolumeKMSKeyId",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -14160,13 +16767,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "nextToken",
-          "queryString" : true,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "dataVolumeKMSKeyId",
+          "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "nextToken",
+          "unmarshallLocationName" : "dataVolumeKMSKeyId",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -14178,14 +16785,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "NextToken",
+        "name" : "DataVolumeKMSKeyId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-        "setterMethodName" : "setNextToken",
+        "setterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@param dataVolumeKMSKeyId <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>*/",
+        "setterMethodName" : "setDataVolumeKMSKeyId",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
+          "variableName" : "dataVolumeKMSKeyId",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -14194,29 +16801,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@param dataVolumeKMSKeyId <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
+          "variableName" : "dataVolumeKMSKeyId",
           "variableType" : "String",
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ClusterNameFilter" : {
-          "c2jName" : "ClusterNameFilter",
+        "DataVolumeKMSKeyId" : {
+          "c2jName" : "DataVolumeKMSKeyId",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>",
+          "documentation" : "\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@param clusterNameFilter Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterNameFilter",
-          "getterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@return Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.*/",
-          "getterMethodName" : "getClusterNameFilter",
+          "fluentSetterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@param dataVolumeKMSKeyId <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDataVolumeKMSKeyId",
+          "getterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@return <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>*/",
+          "getterMethodName" : "getDataVolumeKMSKeyId",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -14229,13 +16836,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "clusterNameFilter",
-            "queryString" : true,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "dataVolumeKMSKeyId",
+            "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterNameFilter",
+            "unmarshallLocationName" : "dataVolumeKMSKeyId",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -14247,14 +16854,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ClusterNameFilter",
+          "name" : "DataVolumeKMSKeyId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@param clusterNameFilter Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.*/",
-          "setterMethodName" : "setClusterNameFilter",
+          "setterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@param dataVolumeKMSKeyId <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>*/",
+          "setterMethodName" : "setDataVolumeKMSKeyId",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterNameFilter",
+            "variableName" : "dataVolumeKMSKeyId",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -14263,149 +16870,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@param clusterNameFilter Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         \n@param dataVolumeKMSKeyId <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "clusterNameFilter",
+            "variableName" : "dataVolumeKMSKeyId",
             "variableType" : "String",
-            "documentation" : "<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "MaxResults" : {
-          "c2jName" : "MaxResults",
-          "c2jShape" : "MaxResults",
-          "deprecated" : false,
-          "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withMaxResults",
-          "getterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@return The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-          "getterMethodName" : "getMaxResults",
-          "getterModel" : {
-            "returnType" : "Integer",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "maxResults",
-            "queryString" : true,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "maxResults",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "MaxResults",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-          "setterMethodName" : "setMaxResults",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "maxResults",
-            "variableType" : "Integer",
-            "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "maxResults",
-            "variableType" : "Integer",
-            "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "NextToken" : {
-          "c2jName" : "NextToken",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-          "getterMethodName" : "getNextToken",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "nextToken",
-            "queryString" : true,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "nextToken",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "NextToken",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-          "setterMethodName" : "setNextToken",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
-            "variableType" : "String",
-            "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+            "documentation" : "\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -14414,24 +16885,27 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ListClustersRequest",
+      "required" : [ "DataVolumeKMSKeyId" ],
+      "shapeName" : "EncryptionAtRest",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListClustersRequest",
-        "variableName" : "listClustersRequest",
-        "variableType" : "ListClustersRequest",
+        "variableDeclarationType" : "EncryptionAtRest",
+        "variableName" : "encryptionAtRest",
+        "variableType" : "EncryptionAtRest",
         "documentation" : null,
-        "simpleType" : "ListClustersRequest",
-        "variableSetterType" : "ListClustersRequest"
+        "simpleType" : "EncryptionAtRest",
+        "variableSetterType" : "EncryptionAtRest"
       },
       "wrapper" : false
     },
-    "ListClustersResult" : {
-      "c2jName" : "ListClustersResponse",
+    "EncryptionInTransit" : {
+      "c2jName" : "EncryptionInTransit",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -14439,7 +16913,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>The settings for encrypting data in transit.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -14449,17 +16923,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ClusterInfoList",
-        "c2jShape" : "__listOfClusterInfo",
+        "c2jName" : "ClientBroker",
+        "c2jShape" : "ClientBroker",
         "deprecated" : false,
-        "documentation" : "<p>Information on each of the MSK clusters in the response.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n@param clusterInfoList Information on each of the MSK clusters in the response.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterInfoList",
-        "getterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n@return Information on each of the MSK clusters in the response.*/",
-        "getterMethodName" : "getClusterInfoList",
+        "documentation" : "\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         ",
+        "enumType" : "ClientBroker",
+        "fluentSetterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@param clientBroker <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClientBroker*/",
+        "fluentSetterMethodName" : "withClientBroker",
+        "getterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@return <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@see ClientBroker*/",
+        "getterMethodName" : "getClientBroker",
         "getterModel" : {
-          "returnType" : "java.util.List<ClusterInfo>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -14472,143 +16946,61 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clusterInfoList",
+          "marshallLocationName" : "clientBroker",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterInfoList",
+          "unmarshallLocationName" : "clientBroker",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "ClusterInfo",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "ClusterInfo",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "ClusterInfo",
-              "variableName" : "member",
-              "variableType" : "ClusterInfo",
-              "documentation" : "",
-              "simpleType" : "ClusterInfo",
-              "variableSetterType" : "ClusterInfo"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "ClusterInfo",
-              "variableName" : "member",
-              "variableType" : "ClusterInfo",
-              "documentation" : "",
-              "simpleType" : "ClusterInfo",
-              "variableSetterType" : "ClusterInfo"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "ClusterInfo",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "ClusterInfo",
-          "templateImplType" : "java.util.ArrayList<ClusterInfo>",
-          "templateType" : "java.util.List<ClusterInfo>"
-        },
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "ClusterInfoList",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClientBroker",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n@param clusterInfoList Information on each of the MSK clusters in the response.*/",
-        "setterMethodName" : "setClusterInfoList",
+        "setterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@param clientBroker <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@see ClientBroker*/",
+        "setterMethodName" : "setClientBroker",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ClusterInfo>",
-          "variableName" : "clusterInfoList",
-          "variableType" : "java.util.List<ClusterInfo>",
+          "variableDeclarationType" : "String",
+          "variableName" : "clientBroker",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "List<ClusterInfo>",
-          "variableSetterType" : "java.util.Collection<ClusterInfo>"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClusterInfoList(java.util.Collection)} or {@link #withClusterInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param clusterInfoList Information on each of the MSK clusters in the response.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@param clientBroker <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClientBroker*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ClusterInfo>",
-          "variableName" : "clusterInfoList",
-          "variableType" : "java.util.List<ClusterInfo>",
-          "documentation" : "<p>Information on each of the MSK clusters in the response.</p>",
-          "simpleType" : "List<ClusterInfo>",
-          "variableSetterType" : "java.util.Collection<ClusterInfo>"
+          "variableDeclarationType" : "String",
+          "variableName" : "clientBroker",
+          "variableType" : "String",
+          "documentation" : "\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "NextToken",
-        "c2jShape" : "__string",
+        "c2jName" : "InCluster",
+        "c2jShape" : "__boolean",
         "deprecated" : false,
-        "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+        "documentation" : "\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-        "getterMethodName" : "getNextToken",
+        "fluentSetterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@param inCluster <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInCluster",
+        "getterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@return <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>*/",
+        "getterMethodName" : "getInCluster",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "Boolean",
           "documentation" : null
         },
         "http" : {
@@ -14621,11 +17013,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nextToken",
+          "marshallLocationName" : "inCluster",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "nextToken",
+          "unmarshallLocationName" : "inCluster",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -14635,49 +17027,49 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "NextToken",
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "InCluster",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-        "setterMethodName" : "setNextToken",
+        "setterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@param inCluster <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>*/",
+        "setterMethodName" : "setInCluster",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
-          "variableType" : "String",
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "inCluster",
+          "variableType" : "Boolean",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@param inCluster <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
-          "variableType" : "String",
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "inCluster",
+          "variableType" : "Boolean",
+          "documentation" : "\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         ",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ClusterInfoList" : {
-          "c2jName" : "ClusterInfoList",
-          "c2jShape" : "__listOfClusterInfo",
+        "ClientBroker" : {
+          "c2jName" : "ClientBroker",
+          "c2jShape" : "ClientBroker",
           "deprecated" : false,
-          "documentation" : "<p>Information on each of the MSK clusters in the response.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n@param clusterInfoList Information on each of the MSK clusters in the response.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterInfoList",
-          "getterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n@return Information on each of the MSK clusters in the response.*/",
-          "getterMethodName" : "getClusterInfoList",
+          "documentation" : "\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         ",
+          "enumType" : "ClientBroker",
+          "fluentSetterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@param clientBroker <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClientBroker*/",
+          "fluentSetterMethodName" : "withClientBroker",
+          "getterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@return <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@see ClientBroker*/",
+          "getterMethodName" : "getClientBroker",
           "getterModel" : {
-            "returnType" : "java.util.List<ClusterInfo>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -14690,144 +17082,62 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "clusterInfoList",
+            "marshallLocationName" : "clientBroker",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterInfoList",
+            "unmarshallLocationName" : "clientBroker",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "ClusterInfo",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "ClusterInfo",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "ClusterInfo",
-                "variableName" : "member",
-                "variableType" : "ClusterInfo",
-                "documentation" : "",
-                "simpleType" : "ClusterInfo",
-                "variableSetterType" : "ClusterInfo"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "ClusterInfo",
-                "variableName" : "member",
-                "variableType" : "ClusterInfo",
-                "documentation" : "",
-                "simpleType" : "ClusterInfo",
-                "variableSetterType" : "ClusterInfo"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "ClusterInfo",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "ClusterInfo",
-            "templateImplType" : "java.util.ArrayList<ClusterInfo>",
-            "templateType" : "java.util.List<ClusterInfo>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "ClusterInfoList",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClientBroker",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n@param clusterInfoList Information on each of the MSK clusters in the response.*/",
-          "setterMethodName" : "setClusterInfoList",
+          "setterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@param clientBroker <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@see ClientBroker*/",
+          "setterMethodName" : "setClientBroker",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ClusterInfo>",
-            "variableName" : "clusterInfoList",
-            "variableType" : "java.util.List<ClusterInfo>",
+            "variableDeclarationType" : "String",
+            "variableName" : "clientBroker",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<ClusterInfo>",
-            "variableSetterType" : "java.util.Collection<ClusterInfo>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Information on each of the MSK clusters in the response.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClusterInfoList(java.util.Collection)} or {@link #withClusterInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param clusterInfoList Information on each of the MSK clusters in the response.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         \n@param clientBroker <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see ClientBroker*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ClusterInfo>",
-            "variableName" : "clusterInfoList",
-            "variableType" : "java.util.List<ClusterInfo>",
-            "documentation" : "<p>Information on each of the MSK clusters in the response.</p>",
-            "simpleType" : "List<ClusterInfo>",
-            "variableSetterType" : "java.util.Collection<ClusterInfo>"
+            "variableDeclarationType" : "String",
+            "variableName" : "clientBroker",
+            "variableType" : "String",
+            "documentation" : "\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "NextToken" : {
-          "c2jName" : "NextToken",
-          "c2jShape" : "__string",
+        "InCluster" : {
+          "c2jName" : "InCluster",
+          "c2jShape" : "__boolean",
           "deprecated" : false,
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-          "getterMethodName" : "getNextToken",
+          "fluentSetterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@param inCluster <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInCluster",
+          "getterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@return <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>*/",
+          "getterMethodName" : "getInCluster",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "Boolean",
             "documentation" : null
           },
           "http" : {
@@ -14840,11 +17150,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nextToken",
+            "marshallLocationName" : "inCluster",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nextToken",
+            "unmarshallLocationName" : "inCluster",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -14854,33 +17164,33 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "NextToken",
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "InCluster",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-          "setterMethodName" : "setNextToken",
+          "setterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@param inCluster <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>*/",
+          "setterMethodName" : "setInCluster",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
-            "variableType" : "String",
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "inCluster",
+            "variableType" : "Boolean",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         \n@param inCluster <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
-            "variableType" : "String",
-            "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "inCluster",
+            "variableType" : "Boolean",
+            "documentation" : "\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         ",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
           },
           "xmlNameSpaceUri" : null
         }
@@ -14888,7 +17198,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListClustersResult",
+      "shapeName" : "EncryptionInTransit",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -14897,17 +17207,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListClustersResult",
-        "variableName" : "listClustersResult",
-        "variableType" : "ListClustersResult",
+        "variableDeclarationType" : "EncryptionInTransit",
+        "variableName" : "encryptionInTransit",
+        "variableType" : "EncryptionInTransit",
         "documentation" : null,
-        "simpleType" : "ListClustersResult",
-        "variableSetterType" : "ListClustersResult"
+        "simpleType" : "EncryptionInTransit",
+        "variableSetterType" : "EncryptionInTransit"
       },
       "wrapper" : false
     },
-    "ListConfigurationsRequest" : {
-      "c2jName" : "ListConfigurationsRequest",
+    "EncryptionInfo" : {
+      "c2jName" : "EncryptionInfo",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -14915,7 +17225,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>Includes encryption-related information, such as the AWS KMS key used for encrypting data at rest and whether you want MSK to encrypt your data in transit.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -14923,26 +17233,19 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "ListConfigurations",
-        "locationName" : null,
-        "requestUri" : "/v1/configurations",
-        "target" : null,
-        "verb" : "GET",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "MaxResults",
-        "c2jShape" : "__string",
+        "c2jName" : "EncryptionAtRest",
+        "c2jShape" : "EncryptionAtRest",
         "deprecated" : false,
-        "documentation" : "<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>",
+        "documentation" : "\n            <p>The data-volume encryption details.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withMaxResults",
-        "getterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.*/",
-        "getterMethodName" : "getMaxResults",
+        "fluentSetterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@param encryptionAtRest <p>The data-volume encryption details.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEncryptionAtRest",
+        "getterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@return <p>The data-volume encryption details.</p>*/",
+        "getterMethodName" : "getEncryptionAtRest",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "EncryptionAtRest",
           "documentation" : null
         },
         "http" : {
@@ -14953,13 +17256,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "maxResults",
-          "queryString" : true,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "encryptionAtRest",
+          "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "maxResults",
+          "unmarshallLocationName" : "encryptionAtRest",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -14969,47 +17272,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "MaxResults",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "EncryptionAtRest",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.*/",
-        "setterMethodName" : "setMaxResults",
+        "setterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@param encryptionAtRest <p>The data-volume encryption details.</p>*/",
+        "setterMethodName" : "setEncryptionAtRest",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "maxResults",
-          "variableType" : "String",
+          "variableDeclarationType" : "EncryptionAtRest",
+          "variableName" : "encryptionAtRest",
+          "variableType" : "EncryptionAtRest",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "EncryptionAtRest",
+          "variableSetterType" : "EncryptionAtRest"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@param encryptionAtRest <p>The data-volume encryption details.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "maxResults",
-          "variableType" : "String",
-          "documentation" : "<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "EncryptionAtRest",
+          "variableName" : "encryptionAtRest",
+          "variableType" : "EncryptionAtRest",
+          "documentation" : "\n            <p>The data-volume encryption details.</p>\n         ",
+          "simpleType" : "EncryptionAtRest",
+          "variableSetterType" : "EncryptionAtRest"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "NextToken",
-        "c2jShape" : "__string",
+        "c2jName" : "EncryptionInTransit",
+        "c2jShape" : "EncryptionInTransit",
         "deprecated" : false,
-        "documentation" : "<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>",
+        "documentation" : "\n            <p>The details for encryption in transit.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@return The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.*/",
-        "getterMethodName" : "getNextToken",
+        "fluentSetterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@param encryptionInTransit <p>The details for encryption in transit.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEncryptionInTransit",
+        "getterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@return <p>The details for encryption in transit.</p>*/",
+        "getterMethodName" : "getEncryptionInTransit",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "EncryptionInTransit",
           "documentation" : null
         },
         "http" : {
@@ -15020,13 +17323,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "nextToken",
-          "queryString" : true,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "encryptionInTransit",
+          "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "nextToken",
+          "unmarshallLocationName" : "encryptionInTransit",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -15036,49 +17339,49 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "NextToken",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "EncryptionInTransit",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.*/",
-        "setterMethodName" : "setNextToken",
+        "setterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@param encryptionInTransit <p>The details for encryption in transit.</p>*/",
+        "setterMethodName" : "setEncryptionInTransit",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
-          "variableType" : "String",
+          "variableDeclarationType" : "EncryptionInTransit",
+          "variableName" : "encryptionInTransit",
+          "variableType" : "EncryptionInTransit",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "EncryptionInTransit",
+          "variableSetterType" : "EncryptionInTransit"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@param encryptionInTransit <p>The details for encryption in transit.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
-          "variableType" : "String",
-          "documentation" : "<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "EncryptionInTransit",
+          "variableName" : "encryptionInTransit",
+          "variableType" : "EncryptionInTransit",
+          "documentation" : "\n            <p>The details for encryption in transit.</p>\n         ",
+          "simpleType" : "EncryptionInTransit",
+          "variableSetterType" : "EncryptionInTransit"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "MaxResults" : {
-          "c2jName" : "MaxResults",
-          "c2jShape" : "__string",
+        "EncryptionAtRest" : {
+          "c2jName" : "EncryptionAtRest",
+          "c2jShape" : "EncryptionAtRest",
           "deprecated" : false,
-          "documentation" : "<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>",
+          "documentation" : "\n            <p>The data-volume encryption details.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withMaxResults",
-          "getterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.*/",
-          "getterMethodName" : "getMaxResults",
+          "fluentSetterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@param encryptionAtRest <p>The data-volume encryption details.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEncryptionAtRest",
+          "getterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@return <p>The data-volume encryption details.</p>*/",
+          "getterMethodName" : "getEncryptionAtRest",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "EncryptionAtRest",
             "documentation" : null
           },
           "http" : {
@@ -15089,13 +17392,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "maxResults",
-            "queryString" : true,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "maxResults",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "encryptionAtRest",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "encryptionAtRest",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -15105,48 +17408,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "MaxResults",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "EncryptionAtRest",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.*/",
-          "setterMethodName" : "setMaxResults",
+          "setterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@param encryptionAtRest <p>The data-volume encryption details.</p>*/",
+          "setterMethodName" : "setEncryptionAtRest",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "maxResults",
-            "variableType" : "String",
+            "variableDeclarationType" : "EncryptionAtRest",
+            "variableName" : "encryptionAtRest",
+            "variableType" : "EncryptionAtRest",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "EncryptionAtRest",
+            "variableSetterType" : "EncryptionAtRest"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The data-volume encryption details.</p>\n         \n@param encryptionAtRest <p>The data-volume encryption details.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "maxResults",
-            "variableType" : "String",
-            "documentation" : "<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "EncryptionAtRest",
+            "variableName" : "encryptionAtRest",
+            "variableType" : "EncryptionAtRest",
+            "documentation" : "\n            <p>The data-volume encryption details.</p>\n         ",
+            "simpleType" : "EncryptionAtRest",
+            "variableSetterType" : "EncryptionAtRest"
           },
           "xmlNameSpaceUri" : null
         },
-        "NextToken" : {
-          "c2jName" : "NextToken",
-          "c2jShape" : "__string",
+        "EncryptionInTransit" : {
+          "c2jName" : "EncryptionInTransit",
+          "c2jShape" : "EncryptionInTransit",
           "deprecated" : false,
-          "documentation" : "<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>The details for encryption in transit.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@return The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.*/",
-          "getterMethodName" : "getNextToken",
+          "fluentSetterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@param encryptionInTransit <p>The details for encryption in transit.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEncryptionInTransit",
+          "getterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@return <p>The details for encryption in transit.</p>*/",
+          "getterMethodName" : "getEncryptionInTransit",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "EncryptionInTransit",
             "documentation" : null
           },
           "http" : {
@@ -15157,13 +17460,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "nextToken",
-            "queryString" : true,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "encryptionInTransit",
+            "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nextToken",
+            "unmarshallLocationName" : "encryptionInTransit",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -15173,33 +17476,33 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "NextToken",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "EncryptionInTransit",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.*/",
-          "setterMethodName" : "setNextToken",
+          "setterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@param encryptionInTransit <p>The details for encryption in transit.</p>*/",
+          "setterMethodName" : "setEncryptionInTransit",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
-            "variableType" : "String",
+            "variableDeclarationType" : "EncryptionInTransit",
+            "variableName" : "encryptionInTransit",
+            "variableType" : "EncryptionInTransit",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "EncryptionInTransit",
+            "variableSetterType" : "EncryptionInTransit"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The details for encryption in transit.</p>\n         \n@param encryptionInTransit <p>The details for encryption in transit.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
-            "variableType" : "String",
-            "documentation" : "<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "EncryptionInTransit",
+            "variableName" : "encryptionInTransit",
+            "variableType" : "EncryptionInTransit",
+            "documentation" : "\n            <p>The details for encryption in transit.</p>\n         ",
+            "simpleType" : "EncryptionInTransit",
+            "variableSetterType" : "EncryptionInTransit"
           },
           "xmlNameSpaceUri" : null
         }
@@ -15207,23 +17510,26 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListConfigurationsRequest",
+      "shapeName" : "EncryptionInfo",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListConfigurationsRequest",
-        "variableName" : "listConfigurationsRequest",
-        "variableType" : "ListConfigurationsRequest",
+        "variableDeclarationType" : "EncryptionInfo",
+        "variableName" : "encryptionInfo",
+        "variableType" : "EncryptionInfo",
         "documentation" : null,
-        "simpleType" : "ListConfigurationsRequest",
-        "variableSetterType" : "ListConfigurationsRequest"
+        "simpleType" : "EncryptionInfo",
+        "variableSetterType" : "EncryptionInfo"
       },
       "wrapper" : false
     },
-    "ListConfigurationsResult" : {
-      "c2jName" : "ListConfigurationsResponse",
+    "EnhancedMonitoring" : {
+      "c2jName" : "EnhancedMonitoring",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -15231,7 +17537,57 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         ",
+      "enums" : [ {
+        "name" : "DEFAULT",
+        "value" : "DEFAULT"
+      }, {
+        "name" : "PER_BROKER",
+        "value" : "PER_BROKER"
+      }, {
+        "name" : "PER_TOPIC_PER_BROKER",
+        "value" : "PER_TOPIC_PER_BROKER"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "EnhancedMonitoring",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "EnhancedMonitoring",
+        "variableName" : "enhancedMonitoring",
+        "variableType" : "EnhancedMonitoring",
+        "documentation" : null,
+        "simpleType" : "EnhancedMonitoring",
+        "variableSetterType" : "EnhancedMonitoring"
+      },
+      "wrapper" : false
+    },
+    "ErrorInfo" : {
+      "c2jName" : "ErrorInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns information about an error state of the cluster.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -15241,17 +17597,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "Configurations",
-        "c2jShape" : "__listOfConfiguration",
+        "c2jName" : "ErrorCode",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>An array of MSK configurations.</p>",
+        "documentation" : "\n            <p>A number describing the error programmatically.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>An array of MSK configurations.</p>\n@param configurations An array of MSK configurations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withConfigurations",
-        "getterDocumentation" : "/**<p>An array of MSK configurations.</p>\n@return An array of MSK configurations.*/",
-        "getterMethodName" : "getConfigurations",
+        "fluentSetterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@param errorCode <p>A number describing the error programmatically.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withErrorCode",
+        "getterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@return <p>A number describing the error programmatically.</p>*/",
+        "getterMethodName" : "getErrorCode",
         "getterModel" : {
-          "returnType" : "java.util.List<Configuration>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -15264,141 +17620,59 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "configurations",
+          "marshallLocationName" : "errorCode",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "configurations",
+          "unmarshallLocationName" : "errorCode",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "Configuration",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "Configuration",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "Configuration",
-              "variableName" : "member",
-              "variableType" : "Configuration",
-              "documentation" : "",
-              "simpleType" : "Configuration",
-              "variableSetterType" : "Configuration"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "Configuration",
-              "variableName" : "member",
-              "variableType" : "Configuration",
-              "documentation" : "",
-              "simpleType" : "Configuration",
-              "variableSetterType" : "Configuration"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "Configuration",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "Configuration",
-          "templateImplType" : "java.util.ArrayList<Configuration>",
-          "templateType" : "java.util.List<Configuration>"
-        },
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "Configurations",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ErrorCode",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>An array of MSK configurations.</p>\n@param configurations An array of MSK configurations.*/",
-        "setterMethodName" : "setConfigurations",
+        "setterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@param errorCode <p>A number describing the error programmatically.</p>*/",
+        "setterMethodName" : "setErrorCode",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Configuration>",
-          "variableName" : "configurations",
-          "variableType" : "java.util.List<Configuration>",
+          "variableDeclarationType" : "String",
+          "variableName" : "errorCode",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "List<Configuration>",
-          "variableSetterType" : "java.util.Collection<Configuration>"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>An array of MSK configurations.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setConfigurations(java.util.Collection)} or {@link #withConfigurations(java.util.Collection)} if you want to override the existing values.</p>\n@param configurations An array of MSK configurations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@param errorCode <p>A number describing the error programmatically.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Configuration>",
-          "variableName" : "configurations",
-          "variableType" : "java.util.List<Configuration>",
-          "documentation" : "<p>An array of MSK configurations.</p>",
-          "simpleType" : "List<Configuration>",
-          "variableSetterType" : "java.util.Collection<Configuration>"
-        },
+          "variableDeclarationType" : "String",
+          "variableName" : "errorCode",
+          "variableType" : "String",
+          "documentation" : "\n            <p>A number describing the error programmatically.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "NextToken",
+        "c2jName" : "ErrorString",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>",
+        "documentation" : "\n            <p>An optional field to provide more details about the error.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.*/",
-        "getterMethodName" : "getNextToken",
+        "fluentSetterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@param errorString <p>An optional field to provide more details about the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withErrorString",
+        "getterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@return <p>An optional field to provide more details about the error.</p>*/",
+        "getterMethodName" : "getErrorString",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -15413,11 +17687,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nextToken",
+          "marshallLocationName" : "errorString",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "nextToken",
+          "unmarshallLocationName" : "errorString",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -15429,14 +17703,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "NextToken",
+        "name" : "ErrorString",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.*/",
-        "setterMethodName" : "setNextToken",
+        "setterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@param errorString <p>An optional field to provide more details about the error.</p>*/",
+        "setterMethodName" : "setErrorString",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
+          "variableName" : "errorString",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -15445,31 +17719,31 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@param errorString <p>An optional field to provide more details about the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
+          "variableName" : "errorString",
           "variableType" : "String",
-          "documentation" : "<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>An optional field to provide more details about the error.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "Configurations" : {
-          "c2jName" : "Configurations",
-          "c2jShape" : "__listOfConfiguration",
+        "ErrorCode" : {
+          "c2jName" : "ErrorCode",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>An array of MSK configurations.</p>",
+          "documentation" : "\n            <p>A number describing the error programmatically.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>An array of MSK configurations.</p>\n@param configurations An array of MSK configurations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withConfigurations",
-          "getterDocumentation" : "/**<p>An array of MSK configurations.</p>\n@return An array of MSK configurations.*/",
-          "getterMethodName" : "getConfigurations",
+          "fluentSetterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@param errorCode <p>A number describing the error programmatically.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withErrorCode",
+          "getterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@return <p>A number describing the error programmatically.</p>*/",
+          "getterMethodName" : "getErrorCode",
           "getterModel" : {
-            "returnType" : "java.util.List<Configuration>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -15482,142 +17756,60 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "configurations",
+            "marshallLocationName" : "errorCode",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "configurations",
+            "unmarshallLocationName" : "errorCode",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "Configuration",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "Configuration",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Configuration",
-                "variableName" : "member",
-                "variableType" : "Configuration",
-                "documentation" : "",
-                "simpleType" : "Configuration",
-                "variableSetterType" : "Configuration"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Configuration",
-                "variableName" : "member",
-                "variableType" : "Configuration",
-                "documentation" : "",
-                "simpleType" : "Configuration",
-                "variableSetterType" : "Configuration"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "Configuration",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "Configuration",
-            "templateImplType" : "java.util.ArrayList<Configuration>",
-            "templateType" : "java.util.List<Configuration>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "Configurations",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ErrorCode",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>An array of MSK configurations.</p>\n@param configurations An array of MSK configurations.*/",
-          "setterMethodName" : "setConfigurations",
+          "setterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@param errorCode <p>A number describing the error programmatically.</p>*/",
+          "setterMethodName" : "setErrorCode",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Configuration>",
-            "variableName" : "configurations",
-            "variableType" : "java.util.List<Configuration>",
+            "variableDeclarationType" : "String",
+            "variableName" : "errorCode",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<Configuration>",
-            "variableSetterType" : "java.util.Collection<Configuration>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>An array of MSK configurations.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setConfigurations(java.util.Collection)} or {@link #withConfigurations(java.util.Collection)} if you want to override the existing values.</p>\n@param configurations An array of MSK configurations.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>A number describing the error programmatically.</p>\n         \n@param errorCode <p>A number describing the error programmatically.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Configuration>",
-            "variableName" : "configurations",
-            "variableType" : "java.util.List<Configuration>",
-            "documentation" : "<p>An array of MSK configurations.</p>",
-            "simpleType" : "List<Configuration>",
-            "variableSetterType" : "java.util.Collection<Configuration>"
+            "variableDeclarationType" : "String",
+            "variableName" : "errorCode",
+            "variableType" : "String",
+            "documentation" : "\n            <p>A number describing the error programmatically.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "NextToken" : {
-          "c2jName" : "NextToken",
+        "ErrorString" : {
+          "c2jName" : "ErrorString",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>An optional field to provide more details about the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.*/",
-          "getterMethodName" : "getNextToken",
+          "fluentSetterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@param errorString <p>An optional field to provide more details about the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withErrorString",
+          "getterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@return <p>An optional field to provide more details about the error.</p>*/",
+          "getterMethodName" : "getErrorString",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -15632,11 +17824,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nextToken",
+            "marshallLocationName" : "errorString",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nextToken",
+            "unmarshallLocationName" : "errorString",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -15648,14 +17840,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "NextToken",
+          "name" : "ErrorString",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.*/",
-          "setterMethodName" : "setNextToken",
+          "setterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@param errorString <p>An optional field to provide more details about the error.</p>*/",
+          "setterMethodName" : "setErrorString",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
+            "variableName" : "errorString",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -15664,13 +17856,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>An optional field to provide more details about the error.</p>\n         \n@param errorString <p>An optional field to provide more details about the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
+            "variableName" : "errorString",
             "variableType" : "String",
-            "documentation" : "<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>",
+            "documentation" : "\n            <p>An optional field to provide more details about the error.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -15680,7 +17872,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListConfigurationsResult",
+      "shapeName" : "ErrorInfo",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -15689,17 +17881,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListConfigurationsResult",
-        "variableName" : "listConfigurationsResult",
-        "variableType" : "ListConfigurationsResult",
+        "variableDeclarationType" : "ErrorInfo",
+        "variableName" : "errorInfo",
+        "variableType" : "ErrorInfo",
         "documentation" : null,
-        "simpleType" : "ListConfigurationsResult",
-        "variableSetterType" : "ListConfigurationsResult"
+        "simpleType" : "ErrorInfo",
+        "variableSetterType" : "ErrorInfo"
       },
       "wrapper" : false
     },
-    "ListNodesRequest" : {
-      "c2jName" : "ListNodesRequest",
+    "ForbiddenException" : {
+      "c2jName" : "ForbiddenException",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -15707,32 +17899,25 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "enums" : null,
-      "errorCode" : null,
+      "errorCode" : "ForbiddenException",
       "hasHeaderMember" : false,
       "hasPayloadMember" : false,
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "ListNodes",
-        "locationName" : null,
-        "requestUri" : "/v1/clusters/{clusterArn}/nodes",
-        "target" : null,
-        "verb" : "GET",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ClusterArn",
+        "c2jName" : "InvalidParameter",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClusterArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "getterMethodName" : "getClusterArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInvalidParameter",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+        "getterMethodName" : "getInvalidParameter",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -15745,14 +17930,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
-          "marshallLocationName" : "clusterArn",
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "invalidParameter",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clusterArn",
-          "uri" : true
+          "unmarshallLocationName" : "invalidParameter",
+          "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -15763,14 +17948,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ClusterArn",
+        "name" : "InvalidParameter",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-        "setterMethodName" : "setClusterArn",
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+        "setterMethodName" : "setInvalidParameter",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
+          "variableName" : "invalidParameter",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -15779,163 +17964,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "clusterArn",
+          "variableName" : "invalidParameter",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "MaxResults",
-        "c2jShape" : "MaxResults",
-        "deprecated" : false,
-        "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withMaxResults",
-        "getterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@return The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-        "getterMethodName" : "getMaxResults",
-        "getterModel" : {
-          "returnType" : "Integer",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "maxResults",
-          "queryString" : true,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "maxResults",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "MaxResults",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-        "setterMethodName" : "setMaxResults",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "maxResults",
-          "variableType" : "Integer",
-          "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "maxResults",
-          "variableType" : "Integer",
-          "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "NextToken",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-        "getterMethodName" : "getNextToken",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "nextToken",
-          "queryString" : true,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "nextToken",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "NextToken",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-        "setterMethodName" : "setNextToken",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
-          "variableType" : "String",
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ClusterArn" : {
-          "c2jName" : "ClusterArn",
+        "InvalidParameter" : {
+          "c2jName" : "InvalidParameter",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withClusterArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-          "getterMethodName" : "getClusterArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInvalidParameter",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+          "getterMethodName" : "getInvalidParameter",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -15948,149 +17999,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
-            "marshallLocationName" : "clusterArn",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "invalidParameter",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "clusterArn",
-            "uri" : true
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "ClusterArn",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.*/",
-          "setterMethodName" : "setClusterArn",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@param clusterArn The Amazon Resource Name (ARN) that uniquely identifies the cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "clusterArn",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "MaxResults" : {
-          "c2jName" : "MaxResults",
-          "c2jShape" : "MaxResults",
-          "deprecated" : false,
-          "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withMaxResults",
-          "getterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@return The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-          "getterMethodName" : "getMaxResults",
-          "getterModel" : {
-            "returnType" : "Integer",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "maxResults",
-            "queryString" : true,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "maxResults",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "MaxResults",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.*/",
-          "setterMethodName" : "setMaxResults",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "maxResults",
-            "variableType" : "Integer",
-            "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>\n@param maxResults The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "maxResults",
-            "variableType" : "Integer",
-            "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "NextToken" : {
-          "c2jName" : "NextToken",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-          "getterMethodName" : "getNextToken",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "nextToken",
-            "queryString" : true,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "nextToken",
+            "unmarshallLocationName" : "invalidParameter",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -16102,14 +18017,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "NextToken",
+          "name" : "InvalidParameter",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.*/",
-          "setterMethodName" : "setNextToken",
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+          "setterMethodName" : "setInvalidParameter",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
+            "variableName" : "invalidParameter",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -16118,13 +18033,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
+            "variableName" : "invalidParameter",
             "variableType" : "String",
-            "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -16133,24 +18048,24 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "ClusterArn" ],
-      "shapeName" : "ListNodesRequest",
+      "required" : null,
+      "shapeName" : "ForbiddenException",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListNodesRequest",
-        "variableName" : "listNodesRequest",
-        "variableType" : "ListNodesRequest",
+        "variableDeclarationType" : "ForbiddenException",
+        "variableName" : "forbiddenException",
+        "variableType" : "ForbiddenException",
         "documentation" : null,
-        "simpleType" : "ListNodesRequest",
-        "variableSetterType" : "ListNodesRequest"
+        "simpleType" : "ForbiddenException",
+        "variableSetterType" : "ForbiddenException"
       },
       "wrapper" : false
     },
-    "ListNodesResult" : {
-      "c2jName" : "ListNodesResponse",
+    "GetBootstrapBrokersRequest" : {
+      "c2jName" : "GetBootstrapBrokersRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -16166,17 +18081,24 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "GetBootstrapBrokers",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters/{clusterArn}/bootstrap-brokers",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "NextToken",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNextToken",
-        "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.*/",
-        "getterMethodName" : "getNextToken",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -16189,14 +18111,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nextToken",
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "nextToken",
-          "uri" : false
+          "unmarshallLocationName" : "clusterArn",
+          "uri" : true
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -16207,14 +18129,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "NextToken",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.*/",
-        "setterMethodName" : "setNextToken",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -16223,178 +18145,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "nextToken",
+          "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "NodeInfoList",
-        "c2jShape" : "__listOfNodeInfo",
-        "deprecated" : false,
-        "documentation" : "<p>List containing a NodeInfo object.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n@param nodeInfoList List containing a NodeInfo object.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNodeInfoList",
-        "getterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n@return List containing a NodeInfo object.*/",
-        "getterMethodName" : "getNodeInfoList",
-        "getterModel" : {
-          "returnType" : "java.util.List<NodeInfo>",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nodeInfoList",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "nodeInfoList",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "NodeInfo",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "NodeInfo",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "NodeInfo",
-              "variableName" : "member",
-              "variableType" : "NodeInfo",
-              "documentation" : "",
-              "simpleType" : "NodeInfo",
-              "variableSetterType" : "NodeInfo"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "NodeInfo",
-              "variableName" : "member",
-              "variableType" : "NodeInfo",
-              "documentation" : "",
-              "simpleType" : "NodeInfo",
-              "variableSetterType" : "NodeInfo"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "NodeInfo",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "NodeInfo",
-          "templateImplType" : "java.util.ArrayList<NodeInfo>",
-          "templateType" : "java.util.List<NodeInfo>"
-        },
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "NodeInfoList",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n@param nodeInfoList List containing a NodeInfo object.*/",
-        "setterMethodName" : "setNodeInfoList",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<NodeInfo>",
-          "variableName" : "nodeInfoList",
-          "variableType" : "java.util.List<NodeInfo>",
-          "documentation" : "",
-          "simpleType" : "List<NodeInfo>",
-          "variableSetterType" : "java.util.Collection<NodeInfo>"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setNodeInfoList(java.util.Collection)} or {@link #withNodeInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param nodeInfoList List containing a NodeInfo object.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<NodeInfo>",
-          "variableName" : "nodeInfoList",
-          "variableType" : "java.util.List<NodeInfo>",
-          "documentation" : "<p>List containing a NodeInfo object.</p>",
-          "simpleType" : "List<NodeInfo>",
-          "variableSetterType" : "java.util.Collection<NodeInfo>"
-        },
-        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "NextToken" : {
-          "c2jName" : "NextToken",
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNextToken",
-          "getterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@return The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.*/",
-          "getterMethodName" : "getNextToken",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -16407,14 +18180,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nextToken",
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nextToken",
-            "uri" : false
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : true
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -16425,14 +18198,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "NextToken",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.*/",
-          "setterMethodName" : "setNextToken",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -16441,225 +18214,132 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>\n@param nextToken The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "nextToken",
+            "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ClusterArn" ],
+      "shapeName" : "GetBootstrapBrokersRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "GetBootstrapBrokersRequest",
+        "variableName" : "getBootstrapBrokersRequest",
+        "variableType" : "GetBootstrapBrokersRequest",
+        "documentation" : null,
+        "simpleType" : "GetBootstrapBrokersRequest",
+        "variableSetterType" : "GetBootstrapBrokersRequest"
+      },
+      "wrapper" : false
+    },
+    "GetBootstrapBrokersResult" : {
+      "c2jName" : "GetBootstrapBrokersResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "BootstrapBrokerString",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>A string containing one or more hostname:port pairs.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@param bootstrapBrokerString <p>A string containing one or more hostname:port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBootstrapBrokerString",
+        "getterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@return <p>A string containing one or more hostname:port pairs.</p>*/",
+        "getterMethodName" : "getBootstrapBrokerString",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "bootstrapBrokerString",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "bootstrapBrokerString",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "BootstrapBrokerString",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@param bootstrapBrokerString <p>A string containing one or more hostname:port pairs.</p>*/",
+        "setterMethodName" : "setBootstrapBrokerString",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bootstrapBrokerString",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@param bootstrapBrokerString <p>A string containing one or more hostname:port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "bootstrapBrokerString",
+          "variableType" : "String",
+          "documentation" : "\n            <p>A string containing one or more hostname:port pairs.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
-        "NodeInfoList" : {
-          "c2jName" : "NodeInfoList",
-          "c2jShape" : "__listOfNodeInfo",
-          "deprecated" : false,
-          "documentation" : "<p>List containing a NodeInfo object.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n@param nodeInfoList List containing a NodeInfo object.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNodeInfoList",
-          "getterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n@return List containing a NodeInfo object.*/",
-          "getterMethodName" : "getNodeInfoList",
-          "getterModel" : {
-            "returnType" : "java.util.List<NodeInfo>",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nodeInfoList",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "nodeInfoList",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "NodeInfo",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "NodeInfo",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "NodeInfo",
-                "variableName" : "member",
-                "variableType" : "NodeInfo",
-                "documentation" : "",
-                "simpleType" : "NodeInfo",
-                "variableSetterType" : "NodeInfo"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "NodeInfo",
-                "variableName" : "member",
-                "variableType" : "NodeInfo",
-                "documentation" : "",
-                "simpleType" : "NodeInfo",
-                "variableSetterType" : "NodeInfo"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "NodeInfo",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "NodeInfo",
-            "templateImplType" : "java.util.ArrayList<NodeInfo>",
-            "templateType" : "java.util.List<NodeInfo>"
-          },
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "NodeInfoList",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n@param nodeInfoList List containing a NodeInfo object.*/",
-          "setterMethodName" : "setNodeInfoList",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<NodeInfo>",
-            "variableName" : "nodeInfoList",
-            "variableType" : "java.util.List<NodeInfo>",
-            "documentation" : "",
-            "simpleType" : "List<NodeInfo>",
-            "variableSetterType" : "java.util.Collection<NodeInfo>"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>List containing a NodeInfo object.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setNodeInfoList(java.util.Collection)} or {@link #withNodeInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param nodeInfoList List containing a NodeInfo object.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<NodeInfo>",
-            "variableName" : "nodeInfoList",
-            "variableType" : "java.util.List<NodeInfo>",
-            "documentation" : "<p>List containing a NodeInfo object.</p>",
-            "simpleType" : "List<NodeInfo>",
-            "variableSetterType" : "java.util.Collection<NodeInfo>"
-          },
-          "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ListNodesResult",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ListNodesResult",
-        "variableName" : "listNodesResult",
-        "variableType" : "ListNodesResult",
-        "documentation" : null,
-        "simpleType" : "ListNodesResult",
-        "variableSetterType" : "ListNodesResult"
-      },
-      "wrapper" : false
-    },
-    "ListTagsForResourceRequest" : {
-      "c2jName" : "ListTagsForResourceRequest",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "",
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "ListTagsForResource",
-        "locationName" : null,
-        "requestUri" : "/v1/tags/{resourceArn}",
-        "target" : null,
-        "verb" : "GET",
         "xmlNameSpaceUri" : null
-      },
-      "members" : [ {
-        "c2jName" : "ResourceArn",
+      }, {
+        "c2jName" : "BootstrapBrokerStringTls",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+        "documentation" : "\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withResourceArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-        "getterMethodName" : "getResourceArn",
+        "fluentSetterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@param bootstrapBrokerStringTls <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBootstrapBrokerStringTls",
+        "getterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@return <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>*/",
+        "getterMethodName" : "getBootstrapBrokerStringTls",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -16672,14 +18352,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
-          "marshallLocationName" : "resourceArn",
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "bootstrapBrokerStringTls",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "resourceArn",
-          "uri" : true
+          "unmarshallLocationName" : "bootstrapBrokerStringTls",
+          "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -16690,14 +18370,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ResourceArn",
+        "name" : "BootstrapBrokerStringTls",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-        "setterMethodName" : "setResourceArn",
+        "setterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@param bootstrapBrokerStringTls <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>*/",
+        "setterMethodName" : "setBootstrapBrokerStringTls",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "resourceArn",
+          "variableName" : "bootstrapBrokerStringTls",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -16706,29 +18386,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@param bootstrapBrokerStringTls <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "resourceArn",
+          "variableName" : "bootstrapBrokerStringTls",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+          "documentation" : "\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ResourceArn" : {
-          "c2jName" : "ResourceArn",
+        "BootstrapBrokerString" : {
+          "c2jName" : "BootstrapBrokerString",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+          "documentation" : "\n            <p>A string containing one or more hostname:port pairs.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResourceArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-          "getterMethodName" : "getResourceArn",
+          "fluentSetterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@param bootstrapBrokerString <p>A string containing one or more hostname:port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBootstrapBrokerString",
+          "getterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@return <p>A string containing one or more hostname:port pairs.</p>*/",
+          "getterMethodName" : "getBootstrapBrokerString",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -16741,14 +18421,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
-            "marshallLocationName" : "resourceArn",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "bootstrapBrokerString",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "resourceArn",
-            "uri" : true
+            "unmarshallLocationName" : "bootstrapBrokerString",
+            "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -16759,14 +18439,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ResourceArn",
+          "name" : "BootstrapBrokerString",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-          "setterMethodName" : "setResourceArn",
+          "setterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@param bootstrapBrokerString <p>A string containing one or more hostname:port pairs.</p>*/",
+          "setterMethodName" : "setBootstrapBrokerString",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceArn",
+            "variableName" : "bootstrapBrokerString",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -16775,39 +18455,110 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>A string containing one or more hostname:port pairs.</p>\n         \n@param bootstrapBrokerString <p>A string containing one or more hostname:port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceArn",
+            "variableName" : "bootstrapBrokerString",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+            "documentation" : "\n            <p>A string containing one or more hostname:port pairs.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : [ "ResourceArn" ],
-      "shapeName" : "ListTagsForResourceRequest",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ListTagsForResourceRequest",
-        "variableName" : "listTagsForResourceRequest",
-        "variableType" : "ListTagsForResourceRequest",
+        },
+        "BootstrapBrokerStringTls" : {
+          "c2jName" : "BootstrapBrokerStringTls",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@param bootstrapBrokerStringTls <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBootstrapBrokerStringTls",
+          "getterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@return <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>*/",
+          "getterMethodName" : "getBootstrapBrokerStringTls",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "bootstrapBrokerStringTls",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "bootstrapBrokerStringTls",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "BootstrapBrokerStringTls",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@param bootstrapBrokerStringTls <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>*/",
+          "setterMethodName" : "setBootstrapBrokerStringTls",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "bootstrapBrokerStringTls",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         \n@param bootstrapBrokerStringTls <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "bootstrapBrokerStringTls",
+            "variableType" : "String",
+            "documentation" : "\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "GetBootstrapBrokersResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "GetBootstrapBrokersResult",
+        "variableName" : "getBootstrapBrokersResult",
+        "variableType" : "GetBootstrapBrokersResult",
         "documentation" : null,
-        "simpleType" : "ListTagsForResourceRequest",
-        "variableSetterType" : "ListTagsForResourceRequest"
+        "simpleType" : "GetBootstrapBrokersResult",
+        "variableSetterType" : "GetBootstrapBrokersResult"
       },
       "wrapper" : false
     },
-    "ListTagsForResourceResult" : {
-      "c2jName" : "ListTagsForResourceResponse",
+    "InternalServerErrorException" : {
+      "c2jName" : "InternalServerErrorException",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -16815,9 +18566,9 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "enums" : null,
-      "errorCode" : null,
+      "errorCode" : "InternalServerErrorException",
       "hasHeaderMember" : false,
       "hasPayloadMember" : false,
       "hasRequiresLengthMember" : false,
@@ -16825,17 +18576,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "Tags",
-        "c2jShape" : "__mapOf__string",
+        "c2jName" : "InvalidParameter",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The key-value pairs for the resource tags</p>",
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withTags",
-        "getterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@return The key-value pairs for the resource tags*/",
-        "getterMethodName" : "getTags",
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInvalidParameter",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+        "getterMethodName" : "getInvalidParameter",
         "getterModel" : {
-          "returnType" : "java.util.Map<String,String>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -16848,11 +18599,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "tags",
+          "marshallLocationName" : "invalidParameter",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "tags",
+          "unmarshallLocationName" : "invalidParameter",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -16860,133 +18611,51 @@
         "jsonValue" : false,
         "list" : false,
         "listModel" : null,
-        "map" : true,
-        "mapModel" : {
-          "implType" : "java.util.HashMap",
-          "interfaceType" : "java.util.Map",
-          "keyLocationName" : "key",
-          "keyModel" : null,
-          "keyType" : "String",
-          "valueLocationName" : "value",
-          "valueModel" : {
-            "c2jName" : "value",
-            "c2jShape" : "__string",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withValue",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getValue",
-            "getterModel" : {
-              "returnType" : "String",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "value",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "value",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "String",
-            "marshallingType" : "STRING",
-            "name" : "Value",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param value */",
-            "setterMethodName" : "setValue",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "value",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : true,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "value",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "valueType" : "String",
-          "entryType" : "Map.Entry<String, String>",
-          "keySimple" : true,
-          "templateImplType" : "java.util.HashMap<String,String>",
-          "templateType" : "java.util.Map<String,String>",
-          "valueList" : false,
-          "valueSimple" : true
-        },
-        "marshallingTargetClass" : "Map",
-        "marshallingType" : "MAP",
-        "name" : "Tags",
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InvalidParameter",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags*/",
-        "setterMethodName" : "setTags",
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+        "setterMethodName" : "setInvalidParameter",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Map<String,String>",
-          "variableName" : "tags",
-          "variableType" : "java.util.Map<String,String>",
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Map<String,String>",
-          "variableSetterType" : "java.util.Map<String,String>"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Map<String,String>",
-          "variableName" : "tags",
-          "variableType" : "java.util.Map<String,String>",
-          "documentation" : "<p>The key-value pairs for the resource tags</p>",
-          "simpleType" : "Map<String,String>",
-          "variableSetterType" : "java.util.Map<String,String>"
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "Tags" : {
-          "c2jName" : "Tags",
-          "c2jShape" : "__mapOf__string",
+        "InvalidParameter" : {
+          "c2jName" : "InvalidParameter",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The key-value pairs for the resource tags</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTags",
-          "getterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@return The key-value pairs for the resource tags*/",
-          "getterMethodName" : "getTags",
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInvalidParameter",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+          "getterMethodName" : "getInvalidParameter",
           "getterModel" : {
-            "returnType" : "java.util.Map<String,String>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -16999,11 +18668,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "tags",
+            "marshallLocationName" : "invalidParameter",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "tags",
+            "unmarshallLocationName" : "invalidParameter",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -17011,117 +18680,35 @@
           "jsonValue" : false,
           "list" : false,
           "listModel" : null,
-          "map" : true,
-          "mapModel" : {
-            "implType" : "java.util.HashMap",
-            "interfaceType" : "java.util.Map",
-            "keyLocationName" : "key",
-            "keyModel" : null,
-            "keyType" : "String",
-            "valueLocationName" : "value",
-            "valueModel" : {
-              "c2jName" : "value",
-              "c2jShape" : "__string",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withValue",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getValue",
-              "getterModel" : {
-                "returnType" : "String",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "value",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "value",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "String",
-              "marshallingType" : "STRING",
-              "name" : "Value",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param value */",
-              "setterMethodName" : "setValue",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "value",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : true,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "value",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "valueType" : "String",
-            "entryType" : "Map.Entry<String, String>",
-            "keySimple" : true,
-            "templateImplType" : "java.util.HashMap<String,String>",
-            "templateType" : "java.util.Map<String,String>",
-            "valueList" : false,
-            "valueSimple" : true
-          },
-          "marshallingTargetClass" : "Map",
-          "marshallingType" : "MAP",
-          "name" : "Tags",
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InvalidParameter",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags*/",
-          "setterMethodName" : "setTags",
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+          "setterMethodName" : "setInvalidParameter",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Map<String,String>",
-            "variableName" : "tags",
-            "variableType" : "java.util.Map<String,String>",
+            "variableDeclarationType" : "String",
+            "variableName" : "invalidParameter",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "Map<String,String>",
-            "variableSetterType" : "java.util.Map<String,String>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Map<String,String>",
-            "variableName" : "tags",
-            "variableType" : "java.util.Map<String,String>",
-            "documentation" : "<p>The key-value pairs for the resource tags</p>",
-            "simpleType" : "Map<String,String>",
-            "variableSetterType" : "java.util.Map<String,String>"
+            "variableDeclarationType" : "String",
+            "variableName" : "invalidParameter",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         }
@@ -17129,26 +18716,23 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListTagsForResourceResult",
+      "shapeName" : "InternalServerErrorException",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
+      "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListTagsForResourceResult",
-        "variableName" : "listTagsForResourceResult",
-        "variableType" : "ListTagsForResourceResult",
+        "variableDeclarationType" : "InternalServerErrorException",
+        "variableName" : "internalServerErrorException",
+        "variableType" : "InternalServerErrorException",
         "documentation" : null,
-        "simpleType" : "ListTagsForResourceResult",
-        "variableSetterType" : "ListTagsForResourceResult"
+        "simpleType" : "InternalServerErrorException",
+        "variableSetterType" : "InternalServerErrorException"
       },
       "wrapper" : false
     },
-    "NodeInfo" : {
-      "c2jName" : "NodeInfo",
+    "ListClusterOperationsRequest" : {
+      "c2jName" : "ListClusterOperationsRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -17156,7 +18740,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>The node information object.</p>",
+      "documentation" : "",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -17164,17 +18748,24 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "ListClusterOperations",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters/{clusterArn}/operations",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "AddedToClusterTime",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The start time.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The start time.</p>\n@param addedToClusterTime The start time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withAddedToClusterTime",
-        "getterDocumentation" : "/**<p>The start time.</p>\n@return The start time.*/",
-        "getterMethodName" : "getAddedToClusterTime",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -17187,14 +18778,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "addedToClusterTime",
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "addedToClusterTime",
-          "uri" : false
+          "unmarshallLocationName" : "clusterArn",
+          "uri" : true
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -17205,14 +18796,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "AddedToClusterTime",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The start time.</p>\n@param addedToClusterTime The start time.*/",
-        "setterMethodName" : "setAddedToClusterTime",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "addedToClusterTime",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -17221,29 +18812,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The start time.</p>\n@param addedToClusterTime The start time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "addedToClusterTime",
+          "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The start time.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "BrokerNodeInfo",
-        "c2jShape" : "BrokerNodeInfo",
+        "c2jName" : "MaxResults",
+        "c2jShape" : "MaxResults",
         "deprecated" : false,
-        "documentation" : "<p>The broker node info.</p>",
+        "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The broker node info.</p>\n@param brokerNodeInfo The broker node info.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withBrokerNodeInfo",
-        "getterDocumentation" : "/**<p>The broker node info.</p>\n@return The broker node info.*/",
-        "getterMethodName" : "getBrokerNodeInfo",
+        "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "getterMethodName" : "getMaxResults",
         "getterModel" : {
-          "returnType" : "BrokerNodeInfo",
+          "returnType" : "Integer",
           "documentation" : null
         },
         "http" : {
@@ -17254,13 +18845,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "brokerNodeInfo",
-          "queryString" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "brokerNodeInfo",
+          "unmarshallLocationName" : "maxResults",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -17270,45 +18861,45 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "BrokerNodeInfo",
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The broker node info.</p>\n@param brokerNodeInfo The broker node info.*/",
-        "setterMethodName" : "setBrokerNodeInfo",
+        "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "setterMethodName" : "setMaxResults",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerNodeInfo",
-          "variableName" : "brokerNodeInfo",
-          "variableType" : "BrokerNodeInfo",
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
           "documentation" : "",
-          "simpleType" : "BrokerNodeInfo",
-          "variableSetterType" : "BrokerNodeInfo"
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The broker node info.</p>\n@param brokerNodeInfo The broker node info.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "BrokerNodeInfo",
-          "variableName" : "brokerNodeInfo",
-          "variableType" : "BrokerNodeInfo",
-          "documentation" : "<p>The broker node info.</p>",
-          "simpleType" : "BrokerNodeInfo",
-          "variableSetterType" : "BrokerNodeInfo"
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "InstanceType",
+        "c2jName" : "NextToken",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The instance type.</p>",
+        "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The instance type.</p>\n@param instanceType The instance type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withInstanceType",
-        "getterDocumentation" : "/**<p>The instance type.</p>\n@return The instance type.*/",
-        "getterMethodName" : "getInstanceType",
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -17321,13 +18912,13 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "instanceType",
-          "queryString" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "instanceType",
+          "unmarshallLocationName" : "nextToken",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -17339,14 +18930,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "InstanceType",
+        "name" : "NextToken",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The instance type.</p>\n@param instanceType The instance type.*/",
-        "setterMethodName" : "setInstanceType",
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "instanceType",
+          "variableName" : "nextToken",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -17355,230 +18946,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The instance type.</p>\n@param instanceType The instance type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "instanceType",
+          "variableName" : "nextToken",
           "variableType" : "String",
-          "documentation" : "<p>The instance type.</p>",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "NodeARN",
-        "c2jShape" : "__string",
-        "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) of the node.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@param nodeARN The Amazon Resource Name (ARN) of the node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNodeARN",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@return The Amazon Resource Name (ARN) of the node.*/",
-        "getterMethodName" : "getNodeARN",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nodeARN",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "nodeARN",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "NodeARN",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@param nodeARN The Amazon Resource Name (ARN) of the node.*/",
-        "setterMethodName" : "setNodeARN",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nodeARN",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@param nodeARN The Amazon Resource Name (ARN) of the node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nodeARN",
-          "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the node.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "NodeType",
-        "c2jShape" : "NodeType",
-        "deprecated" : false,
-        "documentation" : "<p>The node type.</p>",
-        "enumType" : "NodeType",
-        "fluentSetterDocumentation" : "/**<p>The node type.</p>\n@param nodeType The node type.\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
-        "fluentSetterMethodName" : "withNodeType",
-        "getterDocumentation" : "/**<p>The node type.</p>\n@return The node type.\n@see NodeType*/",
-        "getterMethodName" : "getNodeType",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nodeType",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "nodeType",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "NodeType",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The node type.</p>\n@param nodeType The node type.\n@see NodeType*/",
-        "setterMethodName" : "setNodeType",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nodeType",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The node type.</p>\n@param nodeType The node type.\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "nodeType",
-          "variableType" : "String",
-          "documentation" : "<p>The node type.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "ZookeeperNodeInfo",
-        "c2jShape" : "ZookeeperNodeInfo",
-        "deprecated" : false,
-        "documentation" : "<p>The ZookeeperNodeInfo.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@param zookeeperNodeInfo The ZookeeperNodeInfo.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withZookeeperNodeInfo",
-        "getterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@return The ZookeeperNodeInfo.*/",
-        "getterMethodName" : "getZookeeperNodeInfo",
-        "getterModel" : {
-          "returnType" : "ZookeeperNodeInfo",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "zookeeperNodeInfo",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "zookeeperNodeInfo",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "ZookeeperNodeInfo",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@param zookeeperNodeInfo The ZookeeperNodeInfo.*/",
-        "setterMethodName" : "setZookeeperNodeInfo",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ZookeeperNodeInfo",
-          "variableName" : "zookeeperNodeInfo",
-          "variableType" : "ZookeeperNodeInfo",
-          "documentation" : "",
-          "simpleType" : "ZookeeperNodeInfo",
-          "variableSetterType" : "ZookeeperNodeInfo"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@param zookeeperNodeInfo The ZookeeperNodeInfo.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ZookeeperNodeInfo",
-          "variableName" : "zookeeperNodeInfo",
-          "variableType" : "ZookeeperNodeInfo",
-          "documentation" : "<p>The ZookeeperNodeInfo.</p>",
-          "simpleType" : "ZookeeperNodeInfo",
-          "variableSetterType" : "ZookeeperNodeInfo"
-        },
-        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "AddedToClusterTime" : {
-          "c2jName" : "AddedToClusterTime",
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The start time.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The start time.</p>\n@param addedToClusterTime The start time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withAddedToClusterTime",
-          "getterDocumentation" : "/**<p>The start time.</p>\n@return The start time.*/",
-          "getterMethodName" : "getAddedToClusterTime",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -17591,14 +18981,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "addedToClusterTime",
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "addedToClusterTime",
-            "uri" : false
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : true
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -17609,14 +18999,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "AddedToClusterTime",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The start time.</p>\n@param addedToClusterTime The start time.*/",
-          "setterMethodName" : "setAddedToClusterTime",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "addedToClusterTime",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -17625,30 +19015,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The start time.</p>\n@param addedToClusterTime The start time.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "addedToClusterTime",
+            "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The start time.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "BrokerNodeInfo" : {
-          "c2jName" : "BrokerNodeInfo",
-          "c2jShape" : "BrokerNodeInfo",
+        "MaxResults" : {
+          "c2jName" : "MaxResults",
+          "c2jShape" : "MaxResults",
           "deprecated" : false,
-          "documentation" : "<p>The broker node info.</p>",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The broker node info.</p>\n@param brokerNodeInfo The broker node info.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withBrokerNodeInfo",
-          "getterDocumentation" : "/**<p>The broker node info.</p>\n@return The broker node info.*/",
-          "getterMethodName" : "getBrokerNodeInfo",
+          "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "getterMethodName" : "getMaxResults",
           "getterModel" : {
-            "returnType" : "BrokerNodeInfo",
+            "returnType" : "Integer",
             "documentation" : null
           },
           "http" : {
@@ -17659,13 +19049,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "brokerNodeInfo",
-            "queryString" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "brokerNodeInfo",
+            "unmarshallLocationName" : "maxResults",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -17675,46 +19065,46 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "BrokerNodeInfo",
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The broker node info.</p>\n@param brokerNodeInfo The broker node info.*/",
-          "setterMethodName" : "setBrokerNodeInfo",
+          "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "setterMethodName" : "setMaxResults",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "BrokerNodeInfo",
-            "variableName" : "brokerNodeInfo",
-            "variableType" : "BrokerNodeInfo",
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
             "documentation" : "",
-            "simpleType" : "BrokerNodeInfo",
-            "variableSetterType" : "BrokerNodeInfo"
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The broker node info.</p>\n@param brokerNodeInfo The broker node info.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "BrokerNodeInfo",
-            "variableName" : "brokerNodeInfo",
-            "variableType" : "BrokerNodeInfo",
-            "documentation" : "<p>The broker node info.</p>",
-            "simpleType" : "BrokerNodeInfo",
-            "variableSetterType" : "BrokerNodeInfo"
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
           },
           "xmlNameSpaceUri" : null
         },
-        "InstanceType" : {
-          "c2jName" : "InstanceType",
+        "NextToken" : {
+          "c2jName" : "NextToken",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The instance type.</p>",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The instance type.</p>\n@param instanceType The instance type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withInstanceType",
-          "getterDocumentation" : "/**<p>The instance type.</p>\n@return The instance type.*/",
-          "getterMethodName" : "getInstanceType",
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -17727,13 +19117,13 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "instanceType",
-            "queryString" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "instanceType",
+            "unmarshallLocationName" : "nextToken",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -17745,14 +19135,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "InstanceType",
+          "name" : "NextToken",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The instance type.</p>\n@param instanceType The instance type.*/",
-          "setterMethodName" : "setInstanceType",
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "instanceType",
+            "variableName" : "nextToken",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -17761,32 +19151,287 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The instance type.</p>\n@param instanceType The instance type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "instanceType",
+            "variableName" : "nextToken",
             "variableType" : "String",
-            "documentation" : "<p>The instance type.</p>",
+            "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        },
-        "NodeARN" : {
-          "c2jName" : "NodeARN",
-          "c2jShape" : "__string",
-          "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the node.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@param nodeARN The Amazon Resource Name (ARN) of the node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNodeARN",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@return The Amazon Resource Name (ARN) of the node.*/",
-          "getterMethodName" : "getNodeARN",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ClusterArn" ],
+      "shapeName" : "ListClusterOperationsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListClusterOperationsRequest",
+        "variableName" : "listClusterOperationsRequest",
+        "variableType" : "ListClusterOperationsRequest",
+        "documentation" : null,
+        "simpleType" : "ListClusterOperationsRequest",
+        "variableSetterType" : "ListClusterOperationsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListClusterOperationsResult" : {
+      "c2jName" : "ListClusterOperationsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ClusterOperationInfoList",
+        "c2jShape" : "__listOfClusterOperationInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>An array of cluster operation information objects.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n@param clusterOperationInfoList <p>An array of cluster operation information objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterOperationInfoList",
+        "getterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n@return <p>An array of cluster operation information objects.</p>*/",
+        "getterMethodName" : "getClusterOperationInfoList",
+        "getterModel" : {
+          "returnType" : "java.util.List<ClusterOperationInfo>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterOperationInfoList",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterOperationInfoList",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "ClusterOperationInfo",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "ClusterOperationInfo",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ClusterOperationInfo",
+              "variableName" : "member",
+              "variableType" : "ClusterOperationInfo",
+              "documentation" : "",
+              "simpleType" : "ClusterOperationInfo",
+              "variableSetterType" : "ClusterOperationInfo"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ClusterOperationInfo",
+              "variableName" : "member",
+              "variableType" : "ClusterOperationInfo",
+              "documentation" : "",
+              "simpleType" : "ClusterOperationInfo",
+              "variableSetterType" : "ClusterOperationInfo"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "ClusterOperationInfo",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "ClusterOperationInfo",
+          "templateImplType" : "java.util.ArrayList<ClusterOperationInfo>",
+          "templateType" : "java.util.List<ClusterOperationInfo>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "ClusterOperationInfoList",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n@param clusterOperationInfoList <p>An array of cluster operation information objects.</p>*/",
+        "setterMethodName" : "setClusterOperationInfoList",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ClusterOperationInfo>",
+          "variableName" : "clusterOperationInfoList",
+          "variableType" : "java.util.List<ClusterOperationInfo>",
+          "documentation" : "",
+          "simpleType" : "List<ClusterOperationInfo>",
+          "variableSetterType" : "java.util.Collection<ClusterOperationInfo>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClusterOperationInfoList(java.util.Collection)} or {@link #withClusterOperationInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param clusterOperationInfoList <p>An array of cluster operation information objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ClusterOperationInfo>",
+          "variableName" : "clusterOperationInfoList",
+          "variableType" : "java.util.List<ClusterOperationInfo>",
+          "documentation" : "\n            <p>An array of cluster operation information objects.</p>\n         ",
+          "simpleType" : "List<ClusterOperationInfo>",
+          "variableSetterType" : "java.util.Collection<ClusterOperationInfo>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@param nextToken <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@return <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@param nextToken <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@param nextToken <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterOperationInfoList" : {
+          "c2jName" : "ClusterOperationInfoList",
+          "c2jShape" : "__listOfClusterOperationInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>An array of cluster operation information objects.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n@param clusterOperationInfoList <p>An array of cluster operation information objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterOperationInfoList",
+          "getterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n@return <p>An array of cluster operation information objects.</p>*/",
+          "getterMethodName" : "getClusterOperationInfoList",
+          "getterModel" : {
+            "returnType" : "java.util.List<ClusterOperationInfo>",
+            "documentation" : null
+          },
           "http" : {
             "additionalMarshallingPath" : null,
             "additionalUnmarshallingPath" : null,
@@ -17797,130 +19442,7051 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nodeARN",
+            "marshallLocationName" : "clusterOperationInfoList",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nodeARN",
+            "unmarshallLocationName" : "clusterOperationInfoList",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "NodeARN",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@param nodeARN The Amazon Resource Name (ARN) of the node.*/",
-          "setterMethodName" : "setNodeARN",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nodeARN",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the node.</p>\n@param nodeARN The Amazon Resource Name (ARN) of the node.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nodeARN",
-            "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) of the node.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "NodeType" : {
-          "c2jName" : "NodeType",
-          "c2jShape" : "NodeType",
-          "deprecated" : false,
-          "documentation" : "<p>The node type.</p>",
-          "enumType" : "NodeType",
-          "fluentSetterDocumentation" : "/**<p>The node type.</p>\n@param nodeType The node type.\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
-          "fluentSetterMethodName" : "withNodeType",
-          "getterDocumentation" : "/**<p>The node type.</p>\n@return The node type.\n@see NodeType*/",
-          "getterMethodName" : "getNodeType",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "ClusterOperationInfo",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "ClusterOperationInfo",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ClusterOperationInfo",
+                "variableName" : "member",
+                "variableType" : "ClusterOperationInfo",
+                "documentation" : "",
+                "simpleType" : "ClusterOperationInfo",
+                "variableSetterType" : "ClusterOperationInfo"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ClusterOperationInfo",
+                "variableName" : "member",
+                "variableType" : "ClusterOperationInfo",
+                "documentation" : "",
+                "simpleType" : "ClusterOperationInfo",
+                "variableSetterType" : "ClusterOperationInfo"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "ClusterOperationInfo",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "ClusterOperationInfo",
+            "templateImplType" : "java.util.ArrayList<ClusterOperationInfo>",
+            "templateType" : "java.util.List<ClusterOperationInfo>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "ClusterOperationInfoList",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n@param clusterOperationInfoList <p>An array of cluster operation information objects.</p>*/",
+          "setterMethodName" : "setClusterOperationInfoList",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ClusterOperationInfo>",
+            "variableName" : "clusterOperationInfoList",
+            "variableType" : "java.util.List<ClusterOperationInfo>",
+            "documentation" : "",
+            "simpleType" : "List<ClusterOperationInfo>",
+            "variableSetterType" : "java.util.Collection<ClusterOperationInfo>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>An array of cluster operation information objects.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClusterOperationInfoList(java.util.Collection)} or {@link #withClusterOperationInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param clusterOperationInfoList <p>An array of cluster operation information objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ClusterOperationInfo>",
+            "variableName" : "clusterOperationInfoList",
+            "variableType" : "java.util.List<ClusterOperationInfo>",
+            "documentation" : "\n            <p>An array of cluster operation information objects.</p>\n         ",
+            "simpleType" : "List<ClusterOperationInfo>",
+            "variableSetterType" : "java.util.Collection<ClusterOperationInfo>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@param nextToken <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@return <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@param nextToken <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         \n@param nextToken <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListClusterOperationsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListClusterOperationsResult",
+        "variableName" : "listClusterOperationsResult",
+        "variableType" : "ListClusterOperationsResult",
+        "documentation" : null,
+        "simpleType" : "ListClusterOperationsResult",
+        "variableSetterType" : "ListClusterOperationsResult"
+      },
+      "wrapper" : false
+    },
+    "ListClustersRequest" : {
+      "c2jName" : "ListClustersRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListClusters",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ClusterNameFilter",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@param clusterNameFilter <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterNameFilter",
+        "getterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@return <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>*/",
+        "getterMethodName" : "getClusterNameFilter",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "clusterNameFilter",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterNameFilter",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterNameFilter",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@param clusterNameFilter <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>*/",
+        "setterMethodName" : "setClusterNameFilter",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterNameFilter",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@param clusterNameFilter <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterNameFilter",
+          "variableType" : "String",
+          "documentation" : "\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "MaxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterNameFilter" : {
+          "c2jName" : "ClusterNameFilter",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@param clusterNameFilter <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterNameFilter",
+          "getterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@return <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>*/",
+          "getterMethodName" : "getClusterNameFilter",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "clusterNameFilter",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterNameFilter",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterNameFilter",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@param clusterNameFilter <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>*/",
+          "setterMethodName" : "setClusterNameFilter",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterNameFilter",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         \n@param clusterNameFilter <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterNameFilter",
+            "variableType" : "String",
+            "documentation" : "\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MaxResults" : {
+          "c2jName" : "MaxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListClustersRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListClustersRequest",
+        "variableName" : "listClustersRequest",
+        "variableType" : "ListClustersRequest",
+        "documentation" : null,
+        "simpleType" : "ListClustersRequest",
+        "variableSetterType" : "ListClustersRequest"
+      },
+      "wrapper" : false
+    },
+    "ListClustersResult" : {
+      "c2jName" : "ListClustersResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ClusterInfoList",
+        "c2jShape" : "__listOfClusterInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Information on each of the MSK clusters in the response.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n@param clusterInfoList <p>Information on each of the MSK clusters in the response.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterInfoList",
+        "getterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n@return <p>Information on each of the MSK clusters in the response.</p>*/",
+        "getterMethodName" : "getClusterInfoList",
+        "getterModel" : {
+          "returnType" : "java.util.List<ClusterInfo>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterInfoList",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterInfoList",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "ClusterInfo",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "ClusterInfo",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ClusterInfo",
+              "variableName" : "member",
+              "variableType" : "ClusterInfo",
+              "documentation" : "",
+              "simpleType" : "ClusterInfo",
+              "variableSetterType" : "ClusterInfo"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ClusterInfo",
+              "variableName" : "member",
+              "variableType" : "ClusterInfo",
+              "documentation" : "",
+              "simpleType" : "ClusterInfo",
+              "variableSetterType" : "ClusterInfo"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "ClusterInfo",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "ClusterInfo",
+          "templateImplType" : "java.util.ArrayList<ClusterInfo>",
+          "templateType" : "java.util.List<ClusterInfo>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "ClusterInfoList",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n@param clusterInfoList <p>Information on each of the MSK clusters in the response.</p>*/",
+        "setterMethodName" : "setClusterInfoList",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ClusterInfo>",
+          "variableName" : "clusterInfoList",
+          "variableType" : "java.util.List<ClusterInfo>",
+          "documentation" : "",
+          "simpleType" : "List<ClusterInfo>",
+          "variableSetterType" : "java.util.Collection<ClusterInfo>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClusterInfoList(java.util.Collection)} or {@link #withClusterInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param clusterInfoList <p>Information on each of the MSK clusters in the response.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ClusterInfo>",
+          "variableName" : "clusterInfoList",
+          "variableType" : "java.util.List<ClusterInfo>",
+          "documentation" : "\n            <p>Information on each of the MSK clusters in the response.</p>\n         ",
+          "simpleType" : "List<ClusterInfo>",
+          "variableSetterType" : "java.util.Collection<ClusterInfo>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterInfoList" : {
+          "c2jName" : "ClusterInfoList",
+          "c2jShape" : "__listOfClusterInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Information on each of the MSK clusters in the response.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n@param clusterInfoList <p>Information on each of the MSK clusters in the response.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterInfoList",
+          "getterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n@return <p>Information on each of the MSK clusters in the response.</p>*/",
+          "getterMethodName" : "getClusterInfoList",
+          "getterModel" : {
+            "returnType" : "java.util.List<ClusterInfo>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clusterInfoList",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterInfoList",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "ClusterInfo",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "ClusterInfo",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ClusterInfo",
+                "variableName" : "member",
+                "variableType" : "ClusterInfo",
+                "documentation" : "",
+                "simpleType" : "ClusterInfo",
+                "variableSetterType" : "ClusterInfo"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ClusterInfo",
+                "variableName" : "member",
+                "variableType" : "ClusterInfo",
+                "documentation" : "",
+                "simpleType" : "ClusterInfo",
+                "variableSetterType" : "ClusterInfo"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "ClusterInfo",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "ClusterInfo",
+            "templateImplType" : "java.util.ArrayList<ClusterInfo>",
+            "templateType" : "java.util.List<ClusterInfo>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "ClusterInfoList",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n@param clusterInfoList <p>Information on each of the MSK clusters in the response.</p>*/",
+          "setterMethodName" : "setClusterInfoList",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ClusterInfo>",
+            "variableName" : "clusterInfoList",
+            "variableType" : "java.util.List<ClusterInfo>",
+            "documentation" : "",
+            "simpleType" : "List<ClusterInfo>",
+            "variableSetterType" : "java.util.Collection<ClusterInfo>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Information on each of the MSK clusters in the response.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setClusterInfoList(java.util.Collection)} or {@link #withClusterInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param clusterInfoList <p>Information on each of the MSK clusters in the response.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ClusterInfo>",
+            "variableName" : "clusterInfoList",
+            "variableType" : "java.util.List<ClusterInfo>",
+            "documentation" : "\n            <p>Information on each of the MSK clusters in the response.</p>\n         ",
+            "simpleType" : "List<ClusterInfo>",
+            "variableSetterType" : "java.util.Collection<ClusterInfo>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListClustersResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListClustersResult",
+        "variableName" : "listClustersResult",
+        "variableType" : "ListClustersResult",
+        "documentation" : null,
+        "simpleType" : "ListClustersResult",
+        "variableSetterType" : "ListClustersResult"
+      },
+      "wrapper" : false
+    },
+    "ListConfigurationRevisionsRequest" : {
+      "c2jName" : "ListConfigurationRevisionsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListConfigurationRevisions",
+        "locationName" : null,
+        "requestUri" : "/v1/configurations/{arn}/revisions",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "Arn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+        "getterMethodName" : "getArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "arn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "arn",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Arn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+        "setterMethodName" : "setArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "arn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "arn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "MaxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Arn" : {
+          "c2jName" : "Arn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+          "getterMethodName" : "getArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "arn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "arn",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Arn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>*/",
+          "setterMethodName" : "setArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         \n@param arn <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "arn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MaxResults" : {
+          "c2jName" : "MaxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "Arn" ],
+      "shapeName" : "ListConfigurationRevisionsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListConfigurationRevisionsRequest",
+        "variableName" : "listConfigurationRevisionsRequest",
+        "variableType" : "ListConfigurationRevisionsRequest",
+        "documentation" : null,
+        "simpleType" : "ListConfigurationRevisionsRequest",
+        "variableSetterType" : "ListConfigurationRevisionsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListConfigurationRevisionsResult" : {
+      "c2jName" : "ListConfigurationRevisionsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Paginated results marker.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@param nextToken <p>Paginated results marker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@return <p>Paginated results marker.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@param nextToken <p>Paginated results marker.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@param nextToken <p>Paginated results marker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>Paginated results marker.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Revisions",
+        "c2jShape" : "__listOfConfigurationRevision",
+        "deprecated" : false,
+        "documentation" : "\n            <p>List of ConfigurationRevision objects.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n@param revisions <p>List of ConfigurationRevision objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRevisions",
+        "getterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n@return <p>List of ConfigurationRevision objects.</p>*/",
+        "getterMethodName" : "getRevisions",
+        "getterModel" : {
+          "returnType" : "java.util.List<ConfigurationRevision>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "revisions",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "revisions",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "ConfigurationRevision",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "ConfigurationRevision",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ConfigurationRevision",
+              "variableName" : "member",
+              "variableType" : "ConfigurationRevision",
+              "documentation" : "",
+              "simpleType" : "ConfigurationRevision",
+              "variableSetterType" : "ConfigurationRevision"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ConfigurationRevision",
+              "variableName" : "member",
+              "variableType" : "ConfigurationRevision",
+              "documentation" : "",
+              "simpleType" : "ConfigurationRevision",
+              "variableSetterType" : "ConfigurationRevision"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "ConfigurationRevision",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "ConfigurationRevision",
+          "templateImplType" : "java.util.ArrayList<ConfigurationRevision>",
+          "templateType" : "java.util.List<ConfigurationRevision>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Revisions",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n@param revisions <p>List of ConfigurationRevision objects.</p>*/",
+        "setterMethodName" : "setRevisions",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ConfigurationRevision>",
+          "variableName" : "revisions",
+          "variableType" : "java.util.List<ConfigurationRevision>",
+          "documentation" : "",
+          "simpleType" : "List<ConfigurationRevision>",
+          "variableSetterType" : "java.util.Collection<ConfigurationRevision>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRevisions(java.util.Collection)} or {@link #withRevisions(java.util.Collection)} if you want to override the existing values.</p>\n@param revisions <p>List of ConfigurationRevision objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ConfigurationRevision>",
+          "variableName" : "revisions",
+          "variableType" : "java.util.List<ConfigurationRevision>",
+          "documentation" : "\n            <p>List of ConfigurationRevision objects.</p>\n         ",
+          "simpleType" : "List<ConfigurationRevision>",
+          "variableSetterType" : "java.util.Collection<ConfigurationRevision>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Paginated results marker.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@param nextToken <p>Paginated results marker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@return <p>Paginated results marker.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@param nextToken <p>Paginated results marker.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Paginated results marker.</p>\n         \n@param nextToken <p>Paginated results marker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>Paginated results marker.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Revisions" : {
+          "c2jName" : "Revisions",
+          "c2jShape" : "__listOfConfigurationRevision",
+          "deprecated" : false,
+          "documentation" : "\n            <p>List of ConfigurationRevision objects.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n@param revisions <p>List of ConfigurationRevision objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRevisions",
+          "getterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n@return <p>List of ConfigurationRevision objects.</p>*/",
+          "getterMethodName" : "getRevisions",
+          "getterModel" : {
+            "returnType" : "java.util.List<ConfigurationRevision>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "revisions",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "revisions",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "ConfigurationRevision",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "ConfigurationRevision",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ConfigurationRevision",
+                "variableName" : "member",
+                "variableType" : "ConfigurationRevision",
+                "documentation" : "",
+                "simpleType" : "ConfigurationRevision",
+                "variableSetterType" : "ConfigurationRevision"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ConfigurationRevision",
+                "variableName" : "member",
+                "variableType" : "ConfigurationRevision",
+                "documentation" : "",
+                "simpleType" : "ConfigurationRevision",
+                "variableSetterType" : "ConfigurationRevision"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "ConfigurationRevision",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "ConfigurationRevision",
+            "templateImplType" : "java.util.ArrayList<ConfigurationRevision>",
+            "templateType" : "java.util.List<ConfigurationRevision>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Revisions",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n@param revisions <p>List of ConfigurationRevision objects.</p>*/",
+          "setterMethodName" : "setRevisions",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ConfigurationRevision>",
+            "variableName" : "revisions",
+            "variableType" : "java.util.List<ConfigurationRevision>",
+            "documentation" : "",
+            "simpleType" : "List<ConfigurationRevision>",
+            "variableSetterType" : "java.util.Collection<ConfigurationRevision>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>List of ConfigurationRevision objects.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRevisions(java.util.Collection)} or {@link #withRevisions(java.util.Collection)} if you want to override the existing values.</p>\n@param revisions <p>List of ConfigurationRevision objects.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ConfigurationRevision>",
+            "variableName" : "revisions",
+            "variableType" : "java.util.List<ConfigurationRevision>",
+            "documentation" : "\n            <p>List of ConfigurationRevision objects.</p>\n         ",
+            "simpleType" : "List<ConfigurationRevision>",
+            "variableSetterType" : "java.util.Collection<ConfigurationRevision>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListConfigurationRevisionsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListConfigurationRevisionsResult",
+        "variableName" : "listConfigurationRevisionsResult",
+        "variableType" : "ListConfigurationRevisionsResult",
+        "documentation" : null,
+        "simpleType" : "ListConfigurationRevisionsResult",
+        "variableSetterType" : "ListConfigurationRevisionsResult"
+      },
+      "wrapper" : false
+    },
+    "ListConfigurationsRequest" : {
+      "c2jName" : "ListConfigurationsRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListConfigurations",
+        "locationName" : null,
+        "requestUri" : "/v1/configurations",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "MaxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "MaxResults" : {
+          "c2jName" : "MaxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListConfigurationsRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListConfigurationsRequest",
+        "variableName" : "listConfigurationsRequest",
+        "variableType" : "ListConfigurationsRequest",
+        "documentation" : null,
+        "simpleType" : "ListConfigurationsRequest",
+        "variableSetterType" : "ListConfigurationsRequest"
+      },
+      "wrapper" : false
+    },
+    "ListConfigurationsResult" : {
+      "c2jName" : "ListConfigurationsResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "Configurations",
+        "c2jShape" : "__listOfConfiguration",
+        "deprecated" : false,
+        "documentation" : "\n            <p>An array of MSK configurations.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n@param configurations <p>An array of MSK configurations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withConfigurations",
+        "getterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n@return <p>An array of MSK configurations.</p>*/",
+        "getterMethodName" : "getConfigurations",
+        "getterModel" : {
+          "returnType" : "java.util.List<Configuration>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "configurations",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "configurations",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Configuration",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Configuration",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Configuration",
+              "variableName" : "member",
+              "variableType" : "Configuration",
+              "documentation" : "",
+              "simpleType" : "Configuration",
+              "variableSetterType" : "Configuration"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Configuration",
+              "variableName" : "member",
+              "variableType" : "Configuration",
+              "documentation" : "",
+              "simpleType" : "Configuration",
+              "variableSetterType" : "Configuration"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Configuration",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Configuration",
+          "templateImplType" : "java.util.ArrayList<Configuration>",
+          "templateType" : "java.util.List<Configuration>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Configurations",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n@param configurations <p>An array of MSK configurations.</p>*/",
+        "setterMethodName" : "setConfigurations",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Configuration>",
+          "variableName" : "configurations",
+          "variableType" : "java.util.List<Configuration>",
+          "documentation" : "",
+          "simpleType" : "List<Configuration>",
+          "variableSetterType" : "java.util.Collection<Configuration>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setConfigurations(java.util.Collection)} or {@link #withConfigurations(java.util.Collection)} if you want to override the existing values.</p>\n@param configurations <p>An array of MSK configurations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Configuration>",
+          "variableName" : "configurations",
+          "variableType" : "java.util.List<Configuration>",
+          "documentation" : "\n            <p>An array of MSK configurations.</p>\n         ",
+          "simpleType" : "List<Configuration>",
+          "variableSetterType" : "java.util.Collection<Configuration>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Configurations" : {
+          "c2jName" : "Configurations",
+          "c2jShape" : "__listOfConfiguration",
+          "deprecated" : false,
+          "documentation" : "\n            <p>An array of MSK configurations.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n@param configurations <p>An array of MSK configurations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withConfigurations",
+          "getterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n@return <p>An array of MSK configurations.</p>*/",
+          "getterMethodName" : "getConfigurations",
+          "getterModel" : {
+            "returnType" : "java.util.List<Configuration>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "configurations",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "configurations",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Configuration",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Configuration",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Configuration",
+                "variableName" : "member",
+                "variableType" : "Configuration",
+                "documentation" : "",
+                "simpleType" : "Configuration",
+                "variableSetterType" : "Configuration"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Configuration",
+                "variableName" : "member",
+                "variableType" : "Configuration",
+                "documentation" : "",
+                "simpleType" : "Configuration",
+                "variableSetterType" : "Configuration"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Configuration",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Configuration",
+            "templateImplType" : "java.util.ArrayList<Configuration>",
+            "templateType" : "java.util.List<Configuration>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Configurations",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n@param configurations <p>An array of MSK configurations.</p>*/",
+          "setterMethodName" : "setConfigurations",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Configuration>",
+            "variableName" : "configurations",
+            "variableType" : "java.util.List<Configuration>",
+            "documentation" : "",
+            "simpleType" : "List<Configuration>",
+            "variableSetterType" : "java.util.Collection<Configuration>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>An array of MSK configurations.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setConfigurations(java.util.Collection)} or {@link #withConfigurations(java.util.Collection)} if you want to override the existing values.</p>\n@param configurations <p>An array of MSK configurations.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Configuration>",
+            "variableName" : "configurations",
+            "variableType" : "java.util.List<Configuration>",
+            "documentation" : "\n            <p>An array of MSK configurations.</p>\n         ",
+            "simpleType" : "List<Configuration>",
+            "variableSetterType" : "java.util.Collection<Configuration>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListConfigurationsResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListConfigurationsResult",
+        "variableName" : "listConfigurationsResult",
+        "variableType" : "ListConfigurationsResult",
+        "documentation" : null,
+        "simpleType" : "ListConfigurationsResult",
+        "variableSetterType" : "ListConfigurationsResult"
+      },
+      "wrapper" : false
+    },
+    "ListNodesRequest" : {
+      "c2jName" : "ListNodesRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListNodes",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters/{clusterArn}/nodes",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ClusterArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "clusterArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterArn",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "MaxResults",
+        "c2jShape" : "MaxResults",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withMaxResults",
+        "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "getterMethodName" : "getMaxResults",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "maxResults",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "maxResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "MaxResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+        "setterMethodName" : "setMaxResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "maxResults",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "nextToken",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "clusterArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "MaxResults" : {
+          "c2jName" : "MaxResults",
+          "c2jShape" : "MaxResults",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withMaxResults",
+          "getterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@return <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "getterMethodName" : "getMaxResults",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "maxResults",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "maxResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "MaxResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>*/",
+          "setterMethodName" : "setMaxResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         \n@param maxResults <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "maxResults",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "nextToken",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ClusterArn" ],
+      "shapeName" : "ListNodesRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListNodesRequest",
+        "variableName" : "listNodesRequest",
+        "variableType" : "ListNodesRequest",
+        "documentation" : null,
+        "simpleType" : "ListNodesRequest",
+        "variableSetterType" : "ListNodesRequest"
+      },
+      "wrapper" : false
+    },
+    "ListNodesResult" : {
+      "c2jName" : "ListNodesResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "NextToken",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextToken",
+        "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>*/",
+        "getterMethodName" : "getNextToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nextToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nextToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NextToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>*/",
+        "setterMethodName" : "setNextToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nextToken",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NodeInfoList",
+        "c2jShape" : "__listOfNodeInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>List containing a NodeInfo object.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n@param nodeInfoList <p>List containing a NodeInfo object.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNodeInfoList",
+        "getterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n@return <p>List containing a NodeInfo object.</p>*/",
+        "getterMethodName" : "getNodeInfoList",
+        "getterModel" : {
+          "returnType" : "java.util.List<NodeInfo>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nodeInfoList",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nodeInfoList",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "NodeInfo",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "NodeInfo",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "NodeInfo",
+              "variableName" : "member",
+              "variableType" : "NodeInfo",
+              "documentation" : "",
+              "simpleType" : "NodeInfo",
+              "variableSetterType" : "NodeInfo"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "NodeInfo",
+              "variableName" : "member",
+              "variableType" : "NodeInfo",
+              "documentation" : "",
+              "simpleType" : "NodeInfo",
+              "variableSetterType" : "NodeInfo"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "NodeInfo",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "NodeInfo",
+          "templateImplType" : "java.util.ArrayList<NodeInfo>",
+          "templateType" : "java.util.List<NodeInfo>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "NodeInfoList",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n@param nodeInfoList <p>List containing a NodeInfo object.</p>*/",
+        "setterMethodName" : "setNodeInfoList",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<NodeInfo>",
+          "variableName" : "nodeInfoList",
+          "variableType" : "java.util.List<NodeInfo>",
+          "documentation" : "",
+          "simpleType" : "List<NodeInfo>",
+          "variableSetterType" : "java.util.Collection<NodeInfo>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setNodeInfoList(java.util.Collection)} or {@link #withNodeInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param nodeInfoList <p>List containing a NodeInfo object.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<NodeInfo>",
+          "variableName" : "nodeInfoList",
+          "variableType" : "java.util.List<NodeInfo>",
+          "documentation" : "\n            <p>List containing a NodeInfo object.</p>\n         ",
+          "simpleType" : "List<NodeInfo>",
+          "variableSetterType" : "java.util.Collection<NodeInfo>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "NextToken" : {
+          "c2jName" : "NextToken",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextToken",
+          "getterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@return <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>*/",
+          "getterMethodName" : "getNextToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nextToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nextToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NextToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>*/",
+          "setterMethodName" : "setNextToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         \n@param nextToken <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nextToken",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NodeInfoList" : {
+          "c2jName" : "NodeInfoList",
+          "c2jShape" : "__listOfNodeInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>List containing a NodeInfo object.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n@param nodeInfoList <p>List containing a NodeInfo object.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNodeInfoList",
+          "getterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n@return <p>List containing a NodeInfo object.</p>*/",
+          "getterMethodName" : "getNodeInfoList",
+          "getterModel" : {
+            "returnType" : "java.util.List<NodeInfo>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nodeInfoList",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nodeInfoList",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "NodeInfo",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "NodeInfo",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "NodeInfo",
+                "variableName" : "member",
+                "variableType" : "NodeInfo",
+                "documentation" : "",
+                "simpleType" : "NodeInfo",
+                "variableSetterType" : "NodeInfo"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "NodeInfo",
+                "variableName" : "member",
+                "variableType" : "NodeInfo",
+                "documentation" : "",
+                "simpleType" : "NodeInfo",
+                "variableSetterType" : "NodeInfo"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "NodeInfo",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "NodeInfo",
+            "templateImplType" : "java.util.ArrayList<NodeInfo>",
+            "templateType" : "java.util.List<NodeInfo>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "NodeInfoList",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n@param nodeInfoList <p>List containing a NodeInfo object.</p>*/",
+          "setterMethodName" : "setNodeInfoList",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<NodeInfo>",
+            "variableName" : "nodeInfoList",
+            "variableType" : "java.util.List<NodeInfo>",
+            "documentation" : "",
+            "simpleType" : "List<NodeInfo>",
+            "variableSetterType" : "java.util.Collection<NodeInfo>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>List containing a NodeInfo object.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setNodeInfoList(java.util.Collection)} or {@link #withNodeInfoList(java.util.Collection)} if you want to override the existing values.</p>\n@param nodeInfoList <p>List containing a NodeInfo object.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<NodeInfo>",
+            "variableName" : "nodeInfoList",
+            "variableType" : "java.util.List<NodeInfo>",
+            "documentation" : "\n            <p>List containing a NodeInfo object.</p>\n         ",
+            "simpleType" : "List<NodeInfo>",
+            "variableSetterType" : "java.util.Collection<NodeInfo>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListNodesResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListNodesResult",
+        "variableName" : "listNodesResult",
+        "variableType" : "ListNodesResult",
+        "documentation" : null,
+        "simpleType" : "ListNodesResult",
+        "variableSetterType" : "ListNodesResult"
+      },
+      "wrapper" : false
+    },
+    "ListTagsForResourceRequest" : {
+      "c2jName" : "ListTagsForResourceRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListTagsForResource",
+        "locationName" : null,
+        "requestUri" : "/v1/tags/{resourceArn}",
+        "target" : null,
+        "verb" : "GET",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ResourceArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "ResourceArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ResourceArn" ],
+      "shapeName" : "ListTagsForResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListTagsForResourceRequest",
+        "variableName" : "listTagsForResourceRequest",
+        "variableType" : "ListTagsForResourceRequest",
+        "documentation" : null,
+        "simpleType" : "ListTagsForResourceRequest",
+        "variableSetterType" : "ListTagsForResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "ListTagsForResourceResult" : {
+      "c2jName" : "ListTagsForResourceResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "Tags",
+        "c2jShape" : "__mapOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@return <p>The key-value pair for the resource tag.</p>*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.Map<String,String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getValue",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "value",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "value",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Value",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
+        },
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Tags" : {
+          "c2jName" : "Tags",
+          "c2jShape" : "__mapOf__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@return <p>The key-value pair for the resource tag.</p>*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.Map<String,String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tags",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tags",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getValue",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "value",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "value",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
+          },
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListTagsForResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListTagsForResourceResult",
+        "variableName" : "listTagsForResourceResult",
+        "variableType" : "ListTagsForResourceResult",
+        "documentation" : null,
+        "simpleType" : "ListTagsForResourceResult",
+        "variableSetterType" : "ListTagsForResourceResult"
+      },
+      "wrapper" : false
+    },
+    "MutableClusterInfo" : {
+      "c2jName" : "MutableClusterInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Information about cluster attributes that can be updated via update APIs.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "BrokerEBSVolumeInfo",
+        "c2jShape" : "__listOfBrokerEBSVolumeInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n@param brokerEBSVolumeInfo <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBrokerEBSVolumeInfo",
+        "getterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n@return <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>*/",
+        "getterMethodName" : "getBrokerEBSVolumeInfo",
+        "getterModel" : {
+          "returnType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "brokerEBSVolumeInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "brokerEBSVolumeInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "BrokerEBSVolumeInfo",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "BrokerEBSVolumeInfo",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "BrokerEBSVolumeInfo",
+              "variableName" : "member",
+              "variableType" : "BrokerEBSVolumeInfo",
+              "documentation" : "",
+              "simpleType" : "BrokerEBSVolumeInfo",
+              "variableSetterType" : "BrokerEBSVolumeInfo"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "BrokerEBSVolumeInfo",
+              "variableName" : "member",
+              "variableType" : "BrokerEBSVolumeInfo",
+              "documentation" : "",
+              "simpleType" : "BrokerEBSVolumeInfo",
+              "variableSetterType" : "BrokerEBSVolumeInfo"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "BrokerEBSVolumeInfo",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "BrokerEBSVolumeInfo",
+          "templateImplType" : "java.util.ArrayList<BrokerEBSVolumeInfo>",
+          "templateType" : "java.util.List<BrokerEBSVolumeInfo>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "BrokerEBSVolumeInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n@param brokerEBSVolumeInfo <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>*/",
+        "setterMethodName" : "setBrokerEBSVolumeInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "variableName" : "brokerEBSVolumeInfo",
+          "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "documentation" : "",
+          "simpleType" : "List<BrokerEBSVolumeInfo>",
+          "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setBrokerEBSVolumeInfo(java.util.Collection)} or {@link #withBrokerEBSVolumeInfo(java.util.Collection)} if you want to override the existing values.</p>\n@param brokerEBSVolumeInfo <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "variableName" : "brokerEBSVolumeInfo",
+          "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "documentation" : "\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         ",
+          "simpleType" : "List<BrokerEBSVolumeInfo>",
+          "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ConfigurationInfo",
+        "c2jShape" : "ConfigurationInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Information about the changes in the configuration of the brokers.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@param configurationInfo <p>Information about the changes in the configuration of the brokers.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withConfigurationInfo",
+        "getterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@return <p>Information about the changes in the configuration of the brokers.</p>*/",
+        "getterMethodName" : "getConfigurationInfo",
+        "getterModel" : {
+          "returnType" : "ConfigurationInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "configurationInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "configurationInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ConfigurationInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@param configurationInfo <p>Information about the changes in the configuration of the brokers.</p>*/",
+        "setterMethodName" : "setConfigurationInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationInfo",
+          "variableName" : "configurationInfo",
+          "variableType" : "ConfigurationInfo",
+          "documentation" : "",
+          "simpleType" : "ConfigurationInfo",
+          "variableSetterType" : "ConfigurationInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@param configurationInfo <p>Information about the changes in the configuration of the brokers.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationInfo",
+          "variableName" : "configurationInfo",
+          "variableType" : "ConfigurationInfo",
+          "documentation" : "\n            <p>Information about the changes in the configuration of the brokers.</p>\n         ",
+          "simpleType" : "ConfigurationInfo",
+          "variableSetterType" : "ConfigurationInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NumberOfBrokerNodes",
+        "c2jShape" : "__integer",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNumberOfBrokerNodes",
+        "getterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@return <p>The number of broker nodes in the cluster.</p>*/",
+        "getterMethodName" : "getNumberOfBrokerNodes",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "numberOfBrokerNodes",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "numberOfBrokerNodes",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "NumberOfBrokerNodes",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>*/",
+        "setterMethodName" : "setNumberOfBrokerNodes",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "numberOfBrokerNodes",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "numberOfBrokerNodes",
+          "variableType" : "Integer",
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "BrokerEBSVolumeInfo" : {
+          "c2jName" : "BrokerEBSVolumeInfo",
+          "c2jShape" : "__listOfBrokerEBSVolumeInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n@param brokerEBSVolumeInfo <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBrokerEBSVolumeInfo",
+          "getterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n@return <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>*/",
+          "getterMethodName" : "getBrokerEBSVolumeInfo",
+          "getterModel" : {
+            "returnType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "brokerEBSVolumeInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "brokerEBSVolumeInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "BrokerEBSVolumeInfo",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "BrokerEBSVolumeInfo",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "BrokerEBSVolumeInfo",
+                "variableName" : "member",
+                "variableType" : "BrokerEBSVolumeInfo",
+                "documentation" : "",
+                "simpleType" : "BrokerEBSVolumeInfo",
+                "variableSetterType" : "BrokerEBSVolumeInfo"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "BrokerEBSVolumeInfo",
+                "variableName" : "member",
+                "variableType" : "BrokerEBSVolumeInfo",
+                "documentation" : "",
+                "simpleType" : "BrokerEBSVolumeInfo",
+                "variableSetterType" : "BrokerEBSVolumeInfo"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "BrokerEBSVolumeInfo",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "BrokerEBSVolumeInfo",
+            "templateImplType" : "java.util.ArrayList<BrokerEBSVolumeInfo>",
+            "templateType" : "java.util.List<BrokerEBSVolumeInfo>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "BrokerEBSVolumeInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n@param brokerEBSVolumeInfo <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>*/",
+          "setterMethodName" : "setBrokerEBSVolumeInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "variableName" : "brokerEBSVolumeInfo",
+            "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "documentation" : "",
+            "simpleType" : "List<BrokerEBSVolumeInfo>",
+            "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setBrokerEBSVolumeInfo(java.util.Collection)} or {@link #withBrokerEBSVolumeInfo(java.util.Collection)} if you want to override the existing values.</p>\n@param brokerEBSVolumeInfo <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "variableName" : "brokerEBSVolumeInfo",
+            "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "documentation" : "\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         ",
+            "simpleType" : "List<BrokerEBSVolumeInfo>",
+            "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ConfigurationInfo" : {
+          "c2jName" : "ConfigurationInfo",
+          "c2jShape" : "ConfigurationInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Information about the changes in the configuration of the brokers.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@param configurationInfo <p>Information about the changes in the configuration of the brokers.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withConfigurationInfo",
+          "getterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@return <p>Information about the changes in the configuration of the brokers.</p>*/",
+          "getterMethodName" : "getConfigurationInfo",
+          "getterModel" : {
+            "returnType" : "ConfigurationInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "configurationInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "configurationInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ConfigurationInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@param configurationInfo <p>Information about the changes in the configuration of the brokers.</p>*/",
+          "setterMethodName" : "setConfigurationInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationInfo",
+            "variableName" : "configurationInfo",
+            "variableType" : "ConfigurationInfo",
+            "documentation" : "",
+            "simpleType" : "ConfigurationInfo",
+            "variableSetterType" : "ConfigurationInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Information about the changes in the configuration of the brokers.</p>\n         \n@param configurationInfo <p>Information about the changes in the configuration of the brokers.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationInfo",
+            "variableName" : "configurationInfo",
+            "variableType" : "ConfigurationInfo",
+            "documentation" : "\n            <p>Information about the changes in the configuration of the brokers.</p>\n         ",
+            "simpleType" : "ConfigurationInfo",
+            "variableSetterType" : "ConfigurationInfo"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NumberOfBrokerNodes" : {
+          "c2jName" : "NumberOfBrokerNodes",
+          "c2jShape" : "__integer",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNumberOfBrokerNodes",
+          "getterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@return <p>The number of broker nodes in the cluster.</p>*/",
+          "getterMethodName" : "getNumberOfBrokerNodes",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "numberOfBrokerNodes",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "numberOfBrokerNodes",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "NumberOfBrokerNodes",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>*/",
+          "setterMethodName" : "setNumberOfBrokerNodes",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "numberOfBrokerNodes",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The number of broker nodes in the cluster.</p>\n         \n@param numberOfBrokerNodes <p>The number of broker nodes in the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "numberOfBrokerNodes",
+            "variableType" : "Integer",
+            "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         ",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "MutableClusterInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "MutableClusterInfo",
+        "variableName" : "mutableClusterInfo",
+        "variableType" : "MutableClusterInfo",
+        "documentation" : null,
+        "simpleType" : "MutableClusterInfo",
+        "variableSetterType" : "MutableClusterInfo"
+      },
+      "wrapper" : false
+    },
+    "NodeInfo" : {
+      "c2jName" : "NodeInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>The node information object.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "AddedToClusterTime",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The start time.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@param addedToClusterTime <p>The start time.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAddedToClusterTime",
+        "getterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@return <p>The start time.</p>*/",
+        "getterMethodName" : "getAddedToClusterTime",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "addedToClusterTime",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "addedToClusterTime",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "AddedToClusterTime",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@param addedToClusterTime <p>The start time.</p>*/",
+        "setterMethodName" : "setAddedToClusterTime",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "addedToClusterTime",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@param addedToClusterTime <p>The start time.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "addedToClusterTime",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The start time.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "BrokerNodeInfo",
+        "c2jShape" : "BrokerNodeInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The broker node info.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@param brokerNodeInfo <p>The broker node info.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBrokerNodeInfo",
+        "getterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@return <p>The broker node info.</p>*/",
+        "getterMethodName" : "getBrokerNodeInfo",
+        "getterModel" : {
+          "returnType" : "BrokerNodeInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "brokerNodeInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "brokerNodeInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "BrokerNodeInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@param brokerNodeInfo <p>The broker node info.</p>*/",
+        "setterMethodName" : "setBrokerNodeInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "BrokerNodeInfo",
+          "variableName" : "brokerNodeInfo",
+          "variableType" : "BrokerNodeInfo",
+          "documentation" : "",
+          "simpleType" : "BrokerNodeInfo",
+          "variableSetterType" : "BrokerNodeInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@param brokerNodeInfo <p>The broker node info.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "BrokerNodeInfo",
+          "variableName" : "brokerNodeInfo",
+          "variableType" : "BrokerNodeInfo",
+          "documentation" : "\n            <p>The broker node info.</p>\n         ",
+          "simpleType" : "BrokerNodeInfo",
+          "variableSetterType" : "BrokerNodeInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "InstanceType",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The instance type.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@param instanceType <p>The instance type.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInstanceType",
+        "getterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@return <p>The instance type.</p>*/",
+        "getterMethodName" : "getInstanceType",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "instanceType",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "instanceType",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InstanceType",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@param instanceType <p>The instance type.</p>*/",
+        "setterMethodName" : "setInstanceType",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "instanceType",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@param instanceType <p>The instance type.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "instanceType",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The instance type.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NodeARN",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@param nodeARN <p>The Amazon Resource Name (ARN) of the node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNodeARN",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the node.</p>*/",
+        "getterMethodName" : "getNodeARN",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nodeARN",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nodeARN",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NodeARN",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@param nodeARN <p>The Amazon Resource Name (ARN) of the node.</p>*/",
+        "setterMethodName" : "setNodeARN",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nodeARN",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@param nodeARN <p>The Amazon Resource Name (ARN) of the node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nodeARN",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "NodeType",
+        "c2jShape" : "NodeType",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The node type.</p>\n         ",
+        "enumType" : "NodeType",
+        "fluentSetterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@param nodeType <p>The node type.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
+        "fluentSetterMethodName" : "withNodeType",
+        "getterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@return <p>The node type.</p>\n@see NodeType*/",
+        "getterMethodName" : "getNodeType",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nodeType",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nodeType",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "NodeType",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@param nodeType <p>The node type.</p>\n@see NodeType*/",
+        "setterMethodName" : "setNodeType",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nodeType",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@param nodeType <p>The node type.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "nodeType",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The node type.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ZookeeperNodeInfo",
+        "c2jShape" : "ZookeeperNodeInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The ZookeeperNodeInfo.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@param zookeeperNodeInfo <p>The ZookeeperNodeInfo.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withZookeeperNodeInfo",
+        "getterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@return <p>The ZookeeperNodeInfo.</p>*/",
+        "getterMethodName" : "getZookeeperNodeInfo",
+        "getterModel" : {
+          "returnType" : "ZookeeperNodeInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "zookeeperNodeInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "zookeeperNodeInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ZookeeperNodeInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@param zookeeperNodeInfo <p>The ZookeeperNodeInfo.</p>*/",
+        "setterMethodName" : "setZookeeperNodeInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ZookeeperNodeInfo",
+          "variableName" : "zookeeperNodeInfo",
+          "variableType" : "ZookeeperNodeInfo",
+          "documentation" : "",
+          "simpleType" : "ZookeeperNodeInfo",
+          "variableSetterType" : "ZookeeperNodeInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@param zookeeperNodeInfo <p>The ZookeeperNodeInfo.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ZookeeperNodeInfo",
+          "variableName" : "zookeeperNodeInfo",
+          "variableType" : "ZookeeperNodeInfo",
+          "documentation" : "\n            <p>The ZookeeperNodeInfo.</p>\n         ",
+          "simpleType" : "ZookeeperNodeInfo",
+          "variableSetterType" : "ZookeeperNodeInfo"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "AddedToClusterTime" : {
+          "c2jName" : "AddedToClusterTime",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The start time.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@param addedToClusterTime <p>The start time.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAddedToClusterTime",
+          "getterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@return <p>The start time.</p>*/",
+          "getterMethodName" : "getAddedToClusterTime",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "addedToClusterTime",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "addedToClusterTime",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "AddedToClusterTime",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@param addedToClusterTime <p>The start time.</p>*/",
+          "setterMethodName" : "setAddedToClusterTime",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "addedToClusterTime",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The start time.</p>\n         \n@param addedToClusterTime <p>The start time.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "addedToClusterTime",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The start time.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "BrokerNodeInfo" : {
+          "c2jName" : "BrokerNodeInfo",
+          "c2jShape" : "BrokerNodeInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The broker node info.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@param brokerNodeInfo <p>The broker node info.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBrokerNodeInfo",
+          "getterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@return <p>The broker node info.</p>*/",
+          "getterMethodName" : "getBrokerNodeInfo",
+          "getterModel" : {
+            "returnType" : "BrokerNodeInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "brokerNodeInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "brokerNodeInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "BrokerNodeInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@param brokerNodeInfo <p>The broker node info.</p>*/",
+          "setterMethodName" : "setBrokerNodeInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "BrokerNodeInfo",
+            "variableName" : "brokerNodeInfo",
+            "variableType" : "BrokerNodeInfo",
+            "documentation" : "",
+            "simpleType" : "BrokerNodeInfo",
+            "variableSetterType" : "BrokerNodeInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The broker node info.</p>\n         \n@param brokerNodeInfo <p>The broker node info.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "BrokerNodeInfo",
+            "variableName" : "brokerNodeInfo",
+            "variableType" : "BrokerNodeInfo",
+            "documentation" : "\n            <p>The broker node info.</p>\n         ",
+            "simpleType" : "BrokerNodeInfo",
+            "variableSetterType" : "BrokerNodeInfo"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "InstanceType" : {
+          "c2jName" : "InstanceType",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The instance type.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@param instanceType <p>The instance type.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInstanceType",
+          "getterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@return <p>The instance type.</p>*/",
+          "getterMethodName" : "getInstanceType",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "instanceType",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "instanceType",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InstanceType",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@param instanceType <p>The instance type.</p>*/",
+          "setterMethodName" : "setInstanceType",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "instanceType",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The instance type.</p>\n         \n@param instanceType <p>The instance type.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "instanceType",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The instance type.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NodeARN" : {
+          "c2jName" : "NodeARN",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@param nodeARN <p>The Amazon Resource Name (ARN) of the node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNodeARN",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the node.</p>*/",
+          "getterMethodName" : "getNodeARN",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nodeARN",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nodeARN",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NodeARN",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@param nodeARN <p>The Amazon Resource Name (ARN) of the node.</p>*/",
+          "setterMethodName" : "setNodeARN",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nodeARN",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         \n@param nodeARN <p>The Amazon Resource Name (ARN) of the node.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nodeARN",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "NodeType" : {
+          "c2jName" : "NodeType",
+          "c2jShape" : "NodeType",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The node type.</p>\n         ",
+          "enumType" : "NodeType",
+          "fluentSetterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@param nodeType <p>The node type.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
+          "fluentSetterMethodName" : "withNodeType",
+          "getterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@return <p>The node type.</p>\n@see NodeType*/",
+          "getterMethodName" : "getNodeType",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nodeType",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nodeType",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "NodeType",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@param nodeType <p>The node type.</p>\n@see NodeType*/",
+          "setterMethodName" : "setNodeType",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nodeType",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The node type.</p>\n         \n@param nodeType <p>The node type.</p>\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "nodeType",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The node type.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ZookeeperNodeInfo" : {
+          "c2jName" : "ZookeeperNodeInfo",
+          "c2jShape" : "ZookeeperNodeInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The ZookeeperNodeInfo.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@param zookeeperNodeInfo <p>The ZookeeperNodeInfo.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withZookeeperNodeInfo",
+          "getterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@return <p>The ZookeeperNodeInfo.</p>*/",
+          "getterMethodName" : "getZookeeperNodeInfo",
+          "getterModel" : {
+            "returnType" : "ZookeeperNodeInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "zookeeperNodeInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "zookeeperNodeInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ZookeeperNodeInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@param zookeeperNodeInfo <p>The ZookeeperNodeInfo.</p>*/",
+          "setterMethodName" : "setZookeeperNodeInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ZookeeperNodeInfo",
+            "variableName" : "zookeeperNodeInfo",
+            "variableType" : "ZookeeperNodeInfo",
+            "documentation" : "",
+            "simpleType" : "ZookeeperNodeInfo",
+            "variableSetterType" : "ZookeeperNodeInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The ZookeeperNodeInfo.</p>\n         \n@param zookeeperNodeInfo <p>The ZookeeperNodeInfo.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ZookeeperNodeInfo",
+            "variableName" : "zookeeperNodeInfo",
+            "variableType" : "ZookeeperNodeInfo",
+            "documentation" : "\n            <p>The ZookeeperNodeInfo.</p>\n         ",
+            "simpleType" : "ZookeeperNodeInfo",
+            "variableSetterType" : "ZookeeperNodeInfo"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "NodeInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "NodeInfo",
+        "variableName" : "nodeInfo",
+        "variableType" : "NodeInfo",
+        "documentation" : null,
+        "simpleType" : "NodeInfo",
+        "variableSetterType" : "NodeInfo"
+      },
+      "wrapper" : false
+    },
+    "NodeType" : {
+      "c2jName" : "NodeType",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>The broker or Zookeeper node.</p>\n         ",
+      "enums" : [ {
+        "name" : "BROKER",
+        "value" : "BROKER"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "NodeType",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "NodeType",
+        "variableName" : "nodeType",
+        "variableType" : "NodeType",
+        "documentation" : null,
+        "simpleType" : "NodeType",
+        "variableSetterType" : "NodeType"
+      },
+      "wrapper" : false
+    },
+    "NotFoundException" : {
+      "c2jName" : "NotFoundException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
+      "enums" : null,
+      "errorCode" : "NotFoundException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "InvalidParameter",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInvalidParameter",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+        "getterMethodName" : "getInvalidParameter",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "invalidParameter",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "invalidParameter",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InvalidParameter",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+        "setterMethodName" : "setInvalidParameter",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InvalidParameter" : {
+          "c2jName" : "InvalidParameter",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInvalidParameter",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+          "getterMethodName" : "getInvalidParameter",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "invalidParameter",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "invalidParameter",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InvalidParameter",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+          "setterMethodName" : "setInvalidParameter",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "invalidParameter",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "invalidParameter",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "NotFoundException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "NotFoundException",
+        "variableName" : "notFoundException",
+        "variableType" : "NotFoundException",
+        "documentation" : null,
+        "simpleType" : "NotFoundException",
+        "variableSetterType" : "NotFoundException"
+      },
+      "wrapper" : false
+    },
+    "ServiceUnavailableException" : {
+      "c2jName" : "ServiceUnavailableException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
+      "enums" : null,
+      "errorCode" : "ServiceUnavailableException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "InvalidParameter",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withInvalidParameter",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+        "getterMethodName" : "getInvalidParameter",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "invalidParameter",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "invalidParameter",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "InvalidParameter",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+        "setterMethodName" : "setInvalidParameter",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "invalidParameter",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "InvalidParameter" : {
+          "c2jName" : "InvalidParameter",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withInvalidParameter",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
+          "getterMethodName" : "getInvalidParameter",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "invalidParameter",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "invalidParameter",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "InvalidParameter",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
+          "setterMethodName" : "setInvalidParameter",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "invalidParameter",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "invalidParameter",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceUnavailableException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceUnavailableException",
+        "variableName" : "serviceUnavailableException",
+        "variableType" : "ServiceUnavailableException",
+        "documentation" : null,
+        "simpleType" : "ServiceUnavailableException",
+        "variableSetterType" : "ServiceUnavailableException"
+      },
+      "wrapper" : false
+    },
+    "StorageInfo" : {
+      "c2jName" : "StorageInfo",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "EbsStorageInfo",
+        "c2jShape" : "EBSStorageInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>EBS volume information.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@param ebsStorageInfo <p>EBS volume information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEbsStorageInfo",
+        "getterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@return <p>EBS volume information.</p>*/",
+        "getterMethodName" : "getEbsStorageInfo",
+        "getterModel" : {
+          "returnType" : "EBSStorageInfo",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ebsStorageInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ebsStorageInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "EbsStorageInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@param ebsStorageInfo <p>EBS volume information.</p>*/",
+        "setterMethodName" : "setEbsStorageInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "EBSStorageInfo",
+          "variableName" : "ebsStorageInfo",
+          "variableType" : "EBSStorageInfo",
+          "documentation" : "",
+          "simpleType" : "EBSStorageInfo",
+          "variableSetterType" : "EBSStorageInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@param ebsStorageInfo <p>EBS volume information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "EBSStorageInfo",
+          "variableName" : "ebsStorageInfo",
+          "variableType" : "EBSStorageInfo",
+          "documentation" : "\n            <p>EBS volume information.</p>\n         ",
+          "simpleType" : "EBSStorageInfo",
+          "variableSetterType" : "EBSStorageInfo"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "EbsStorageInfo" : {
+          "c2jName" : "EbsStorageInfo",
+          "c2jShape" : "EBSStorageInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>EBS volume information.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@param ebsStorageInfo <p>EBS volume information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEbsStorageInfo",
+          "getterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@return <p>EBS volume information.</p>*/",
+          "getterMethodName" : "getEbsStorageInfo",
+          "getterModel" : {
+            "returnType" : "EBSStorageInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ebsStorageInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ebsStorageInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "EbsStorageInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@param ebsStorageInfo <p>EBS volume information.</p>*/",
+          "setterMethodName" : "setEbsStorageInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "EBSStorageInfo",
+            "variableName" : "ebsStorageInfo",
+            "variableType" : "EBSStorageInfo",
+            "documentation" : "",
+            "simpleType" : "EBSStorageInfo",
+            "variableSetterType" : "EBSStorageInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>EBS volume information.</p>\n         \n@param ebsStorageInfo <p>EBS volume information.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "EBSStorageInfo",
+            "variableName" : "ebsStorageInfo",
+            "variableType" : "EBSStorageInfo",
+            "documentation" : "\n            <p>EBS volume information.</p>\n         ",
+            "simpleType" : "EBSStorageInfo",
+            "variableSetterType" : "EBSStorageInfo"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "StorageInfo",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StorageInfo",
+        "variableName" : "storageInfo",
+        "variableType" : "StorageInfo",
+        "documentation" : null,
+        "simpleType" : "StorageInfo",
+        "variableSetterType" : "StorageInfo"
+      },
+      "wrapper" : false
+    },
+    "TagResourceRequest" : {
+      "c2jName" : "TagResourceRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "TagResource",
+        "locationName" : null,
+        "requestUri" : "/v1/tags/{resourceArn}",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ResourceArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Tags",
+        "c2jShape" : "__mapOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTags",
+        "getterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@return <p>The key-value pair for the resource tag.</p>*/",
+        "getterMethodName" : "getTags",
+        "getterModel" : {
+          "returnType" : "java.util.Map<String,String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tags",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tags",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : true,
+        "mapModel" : {
+          "implType" : "java.util.HashMap",
+          "interfaceType" : "java.util.Map",
+          "keyLocationName" : "key",
+          "keyModel" : null,
+          "keyType" : "String",
+          "valueLocationName" : "value",
+          "valueModel" : {
+            "c2jName" : "value",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withValue",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getValue",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "value",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "value",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Value",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param value */",
+            "setterMethodName" : "setValue",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "value",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "valueType" : "String",
+          "entryType" : "Map.Entry<String, String>",
+          "keySimple" : true,
+          "templateImplType" : "java.util.HashMap<String,String>",
+          "templateType" : "java.util.Map<String,String>",
+          "valueList" : false,
+          "valueSimple" : true
+        },
+        "marshallingTargetClass" : "Map",
+        "marshallingType" : "MAP",
+        "name" : "Tags",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>*/",
+        "setterMethodName" : "setTags",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.Map<String,String>",
+          "variableName" : "tags",
+          "variableType" : "java.util.Map<String,String>",
+          "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+          "simpleType" : "Map<String,String>",
+          "variableSetterType" : "java.util.Map<String,String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "ResourceArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Tags" : {
+          "c2jName" : "Tags",
+          "c2jShape" : "__mapOf__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTags",
+          "getterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@return <p>The key-value pair for the resource tag.</p>*/",
+          "getterMethodName" : "getTags",
+          "getterModel" : {
+            "returnType" : "java.util.Map<String,String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
             "greedy" : false,
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nodeType",
+            "marshallLocationName" : "tags",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nodeType",
+            "unmarshallLocationName" : "tags",
             "uri" : false
           },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : true,
+          "mapModel" : {
+            "implType" : "java.util.HashMap",
+            "interfaceType" : "java.util.Map",
+            "keyLocationName" : "key",
+            "keyModel" : null,
+            "keyType" : "String",
+            "valueLocationName" : "value",
+            "valueModel" : {
+              "c2jName" : "value",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withValue",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getValue",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "value",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "value",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Value",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param value */",
+              "setterMethodName" : "setValue",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "value",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "valueType" : "String",
+            "entryType" : "Map.Entry<String, String>",
+            "keySimple" : true,
+            "templateImplType" : "java.util.HashMap<String,String>",
+            "templateType" : "java.util.Map<String,String>",
+            "valueList" : false,
+            "valueSimple" : true
+          },
+          "marshallingTargetClass" : "Map",
+          "marshallingType" : "MAP",
+          "name" : "Tags",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>*/",
+          "setterMethodName" : "setTags",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The key-value pair for the resource tag.</p>\n         \n@param tags <p>The key-value pair for the resource tag.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.Map<String,String>",
+            "variableName" : "tags",
+            "variableType" : "java.util.Map<String,String>",
+            "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         ",
+            "simpleType" : "Map<String,String>",
+            "variableSetterType" : "java.util.Map<String,String>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ResourceArn", "Tags" ],
+      "shapeName" : "TagResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceRequest",
+        "variableName" : "tagResourceRequest",
+        "variableType" : "TagResourceRequest",
+        "documentation" : null,
+        "simpleType" : "TagResourceRequest",
+        "variableSetterType" : "TagResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "TagResourceResult" : {
+      "c2jName" : "TagResourceResult",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : null,
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TagResourceResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TagResourceResult",
+        "variableName" : "tagResourceResult",
+        "variableType" : "TagResourceResult",
+        "documentation" : null,
+        "simpleType" : "TagResourceResult",
+        "variableSetterType" : "TagResourceResult"
+      },
+      "wrapper" : false
+    },
+    "Tls" : {
+      "c2jName" : "Tls",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "\n            <p>Details for client authentication using TLS.</p>\n         ",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "CertificateAuthorityArnList",
+        "c2jShape" : "__listOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>List of ACM Certificate Authority ARNs.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n@param certificateAuthorityArnList <p>List of ACM Certificate Authority ARNs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCertificateAuthorityArnList",
+        "getterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n@return <p>List of ACM Certificate Authority ARNs.</p>*/",
+        "getterMethodName" : "getCertificateAuthorityArnList",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "certificateAuthorityArnList",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "certificateAuthorityArnList",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
           "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "NodeType",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The node type.</p>\n@param nodeType The node type.\n@see NodeType*/",
-          "setterMethodName" : "setNodeType",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nodeType",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
           "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The node type.</p>\n@param nodeType The node type.\n@return Returns a reference to this object so that method calls can be chained together.\n@see NodeType*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "nodeType",
-            "variableType" : "String",
-            "documentation" : "<p>The node type.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
         },
-        "ZookeeperNodeInfo" : {
-          "c2jName" : "ZookeeperNodeInfo",
-          "c2jShape" : "ZookeeperNodeInfo",
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "CertificateAuthorityArnList",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n@param certificateAuthorityArnList <p>List of ACM Certificate Authority ARNs.</p>*/",
+        "setterMethodName" : "setCertificateAuthorityArnList",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "certificateAuthorityArnList",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setCertificateAuthorityArnList(java.util.Collection)} or {@link #withCertificateAuthorityArnList(java.util.Collection)} if you want to override the existing values.</p>\n@param certificateAuthorityArnList <p>List of ACM Certificate Authority ARNs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "certificateAuthorityArnList",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>List of ACM Certificate Authority ARNs.</p>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "CertificateAuthorityArnList" : {
+          "c2jName" : "CertificateAuthorityArnList",
+          "c2jShape" : "__listOf__string",
           "deprecated" : false,
-          "documentation" : "<p>The ZookeeperNodeInfo.</p>",
+          "documentation" : "\n            <p>List of ACM Certificate Authority ARNs.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@param zookeeperNodeInfo The ZookeeperNodeInfo.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withZookeeperNodeInfo",
-          "getterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@return The ZookeeperNodeInfo.*/",
-          "getterMethodName" : "getZookeeperNodeInfo",
+          "fluentSetterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n@param certificateAuthorityArnList <p>List of ACM Certificate Authority ARNs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCertificateAuthorityArnList",
+          "getterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n@return <p>List of ACM Certificate Authority ARNs.</p>*/",
+          "getterMethodName" : "getCertificateAuthorityArnList",
           "getterModel" : {
-            "returnType" : "ZookeeperNodeInfo",
+            "returnType" : "java.util.List<String>",
             "documentation" : null
           },
           "http" : {
@@ -17933,47 +26499,129 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "zookeeperNodeInfo",
+            "marshallLocationName" : "certificateAuthorityArnList",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "zookeeperNodeInfo",
+            "unmarshallLocationName" : "certificateAuthorityArnList",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "ZookeeperNodeInfo",
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "CertificateAuthorityArnList",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@param zookeeperNodeInfo The ZookeeperNodeInfo.*/",
-          "setterMethodName" : "setZookeeperNodeInfo",
+          "setterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n@param certificateAuthorityArnList <p>List of ACM Certificate Authority ARNs.</p>*/",
+          "setterMethodName" : "setCertificateAuthorityArnList",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ZookeeperNodeInfo",
-            "variableName" : "zookeeperNodeInfo",
-            "variableType" : "ZookeeperNodeInfo",
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "certificateAuthorityArnList",
+            "variableType" : "java.util.List<String>",
             "documentation" : "",
-            "simpleType" : "ZookeeperNodeInfo",
-            "variableSetterType" : "ZookeeperNodeInfo"
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The ZookeeperNodeInfo.</p>\n@param zookeeperNodeInfo The ZookeeperNodeInfo.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>List of ACM Certificate Authority ARNs.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setCertificateAuthorityArnList(java.util.Collection)} or {@link #withCertificateAuthorityArnList(java.util.Collection)} if you want to override the existing values.</p>\n@param certificateAuthorityArnList <p>List of ACM Certificate Authority ARNs.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ZookeeperNodeInfo",
-            "variableName" : "zookeeperNodeInfo",
-            "variableType" : "ZookeeperNodeInfo",
-            "documentation" : "<p>The ZookeeperNodeInfo.</p>",
-            "simpleType" : "ZookeeperNodeInfo",
-            "variableSetterType" : "ZookeeperNodeInfo"
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "certificateAuthorityArnList",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>List of ACM Certificate Authority ARNs.</p>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -17981,51 +26629,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "NodeInfo",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "NodeInfo",
-        "variableName" : "nodeInfo",
-        "variableType" : "NodeInfo",
-        "documentation" : null,
-        "simpleType" : "NodeInfo",
-        "variableSetterType" : "NodeInfo"
-      },
-      "wrapper" : false
-    },
-    "NodeType" : {
-      "c2jName" : "NodeType",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>The broker or Zookeeper node.</p>",
-      "enums" : [ {
-        "name" : "BROKER",
-        "value" : "BROKER"
-      } ],
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "NodeType",
+      "shapeName" : "Tls",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -18034,17 +26638,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "NodeType",
-        "variableName" : "nodeType",
-        "variableType" : "NodeType",
+        "variableDeclarationType" : "Tls",
+        "variableName" : "tls",
+        "variableType" : "Tls",
         "documentation" : null,
-        "simpleType" : "NodeType",
-        "variableSetterType" : "NodeType"
+        "simpleType" : "Tls",
+        "variableSetterType" : "Tls"
       },
       "wrapper" : false
     },
-    "NotFoundException" : {
-      "c2jName" : "NotFoundException",
+    "TooManyRequestsException" : {
+      "c2jName" : "TooManyRequestsException",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -18052,9 +26656,9 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "enums" : null,
-      "errorCode" : "NotFoundException",
+      "errorCode" : "TooManyRequestsException",
       "hasHeaderMember" : false,
       "hasPayloadMember" : false,
       "hasRequiresLengthMember" : false,
@@ -18065,11 +26669,11 @@
         "c2jName" : "InvalidParameter",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
         "getterMethodName" : "getInvalidParameter",
         "getterModel" : {
           "returnType" : "String",
@@ -18103,7 +26707,7 @@
         "marshallingType" : "STRING",
         "name" : "InvalidParameter",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
         "setterMethodName" : "setInvalidParameter",
         "setterModel" : {
           "timestampFormat" : null,
@@ -18117,13 +26721,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "invalidParameter",
           "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -18134,11 +26738,11 @@
           "c2jName" : "InvalidParameter",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
           "getterMethodName" : "getInvalidParameter",
           "getterModel" : {
             "returnType" : "String",
@@ -18172,7 +26776,7 @@
           "marshallingType" : "STRING",
           "name" : "InvalidParameter",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
           "setterMethodName" : "setInvalidParameter",
           "setterModel" : {
             "timestampFormat" : null,
@@ -18186,13 +26790,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "invalidParameter",
             "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -18202,23 +26806,23 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "NotFoundException",
+      "shapeName" : "TooManyRequestsException",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "NotFoundException",
-        "variableName" : "notFoundException",
-        "variableType" : "NotFoundException",
+        "variableDeclarationType" : "TooManyRequestsException",
+        "variableName" : "tooManyRequestsException",
+        "variableType" : "TooManyRequestsException",
         "documentation" : null,
-        "simpleType" : "NotFoundException",
-        "variableSetterType" : "NotFoundException"
+        "simpleType" : "TooManyRequestsException",
+        "variableSetterType" : "TooManyRequestsException"
       },
       "wrapper" : false
     },
-    "ServiceUnavailableException" : {
-      "c2jName" : "ServiceUnavailableException",
+    "UnauthorizedException" : {
+      "c2jName" : "UnauthorizedException",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -18226,9 +26830,9 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "enums" : null,
-      "errorCode" : "ServiceUnavailableException",
+      "errorCode" : "UnauthorizedException",
       "hasHeaderMember" : false,
       "hasPayloadMember" : false,
       "hasRequiresLengthMember" : false,
@@ -18239,11 +26843,11 @@
         "c2jName" : "InvalidParameter",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
+        "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
+        "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
         "getterMethodName" : "getInvalidParameter",
         "getterModel" : {
           "returnType" : "String",
@@ -18277,7 +26881,7 @@
         "marshallingType" : "STRING",
         "name" : "InvalidParameter",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
+        "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
         "setterMethodName" : "setInvalidParameter",
         "setterModel" : {
           "timestampFormat" : null,
@@ -18291,13 +26895,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "invalidParameter",
           "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -18308,11 +26912,11 @@
           "c2jName" : "InvalidParameter",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
+          "getterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@return <p>The parameter that caused the error.</p>*/",
           "getterMethodName" : "getInvalidParameter",
           "getterModel" : {
             "returnType" : "String",
@@ -18346,7 +26950,7 @@
           "marshallingType" : "STRING",
           "name" : "InvalidParameter",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
+          "setterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>*/",
           "setterMethodName" : "setInvalidParameter",
           "setterModel" : {
             "timestampFormat" : null,
@@ -18360,13 +26964,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The parameter that caused the error.</p>\n         \n@param invalidParameter <p>The parameter that caused the error.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "invalidParameter",
             "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
+            "documentation" : "\n            <p>The parameter that caused the error.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -18376,23 +26980,23 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ServiceUnavailableException",
+      "shapeName" : "UnauthorizedException",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ServiceUnavailableException",
-        "variableName" : "serviceUnavailableException",
-        "variableType" : "ServiceUnavailableException",
+        "variableDeclarationType" : "UnauthorizedException",
+        "variableName" : "unauthorizedException",
+        "variableType" : "UnauthorizedException",
         "documentation" : null,
-        "simpleType" : "ServiceUnavailableException",
-        "variableSetterType" : "ServiceUnavailableException"
+        "simpleType" : "UnauthorizedException",
+        "variableSetterType" : "UnauthorizedException"
       },
       "wrapper" : false
     },
-    "StorageInfo" : {
-      "c2jName" : "StorageInfo",
+    "UntagResourceRequest" : {
+      "c2jName" : "UntagResourceRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -18400,7 +27004,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>",
+      "documentation" : "",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -18408,19 +27012,26 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "UntagResource",
+        "locationName" : null,
+        "requestUri" : "/v1/tags/{resourceArn}",
+        "target" : null,
+        "verb" : "DELETE",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "EbsStorageInfo",
-        "c2jShape" : "EBSStorageInfo",
+        "c2jName" : "ResourceArn",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>EBS volume information.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>EBS volume information.</p>\n@param ebsStorageInfo EBS volume information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withEbsStorageInfo",
-        "getterDocumentation" : "/**<p>EBS volume information.</p>\n@return EBS volume information.*/",
-        "getterMethodName" : "getEbsStorageInfo",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+        "getterMethodName" : "getResourceArn",
         "getterModel" : {
-          "returnType" : "EBSStorageInfo",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -18431,14 +27042,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "ebsStorageInfo",
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "resourceArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "ebsStorageInfo",
-          "uri" : false
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : true
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -18447,49 +27058,198 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "EbsStorageInfo",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>EBS volume information.</p>\n@param ebsStorageInfo EBS volume information.*/",
-        "setterMethodName" : "setEbsStorageInfo",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+        "setterMethodName" : "setResourceArn",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "EBSStorageInfo",
-          "variableName" : "ebsStorageInfo",
-          "variableType" : "EBSStorageInfo",
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "EBSStorageInfo",
-          "variableSetterType" : "EBSStorageInfo"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "TagKeys",
+        "c2jShape" : "__listOf__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n@param tagKeys <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTagKeys",
+        "getterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n@return <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>*/",
+        "getterMethodName" : "getTagKeys",
+        "getterModel" : {
+          "returnType" : "java.util.List<String>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "querystring",
+          "marshallLocation" : "QUERY_PARAM",
+          "marshallLocationName" : "tagKeys",
+          "queryString" : true,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tagKeys",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "TagKeys",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n@param tagKeys <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>*/",
+        "setterMethodName" : "setTagKeys",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "tagKeys",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>EBS volume information.</p>\n@param ebsStorageInfo EBS volume information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "EBSStorageInfo",
-          "variableName" : "ebsStorageInfo",
-          "variableType" : "EBSStorageInfo",
-          "documentation" : "<p>EBS volume information.</p>",
-          "simpleType" : "EBSStorageInfo",
-          "variableSetterType" : "EBSStorageInfo"
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "tagKeys",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "EbsStorageInfo" : {
-          "c2jName" : "EbsStorageInfo",
-          "c2jShape" : "EBSStorageInfo",
+        "ResourceArn" : {
+          "c2jName" : "ResourceArn",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>EBS volume information.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>EBS volume information.</p>\n@param ebsStorageInfo EBS volume information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withEbsStorageInfo",
-          "getterDocumentation" : "/**<p>EBS volume information.</p>\n@return EBS volume information.*/",
-          "getterMethodName" : "getEbsStorageInfo",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+          "getterMethodName" : "getResourceArn",
           "getterModel" : {
-            "returnType" : "EBSStorageInfo",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -18500,14 +27260,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "ebsStorageInfo",
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "resourceArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "ebsStorageInfo",
-            "uri" : false
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : true
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -18516,41 +27276,229 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "EbsStorageInfo",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>EBS volume information.</p>\n@param ebsStorageInfo EBS volume information.*/",
-          "setterMethodName" : "setEbsStorageInfo",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>*/",
+          "setterMethodName" : "setResourceArn",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "EBSStorageInfo",
-            "variableName" : "ebsStorageInfo",
-            "variableType" : "EBSStorageInfo",
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "EBSStorageInfo",
-            "variableSetterType" : "EBSStorageInfo"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         \n@param resourceArn <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TagKeys" : {
+          "c2jName" : "TagKeys",
+          "c2jShape" : "__listOf__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n@param tagKeys <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTagKeys",
+          "getterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n@return <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>*/",
+          "getterMethodName" : "getTagKeys",
+          "getterModel" : {
+            "returnType" : "java.util.List<String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "querystring",
+            "marshallLocation" : "QUERY_PARAM",
+            "marshallLocationName" : "tagKeys",
+            "queryString" : true,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tagKeys",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "TagKeys",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n@param tagKeys <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>*/",
+          "setterMethodName" : "setTagKeys",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "tagKeys",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>EBS volume information.</p>\n@param ebsStorageInfo EBS volume information.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "EBSStorageInfo",
-            "variableName" : "ebsStorageInfo",
-            "variableType" : "EBSStorageInfo",
-            "documentation" : "<p>EBS volume information.</p>",
-            "simpleType" : "EBSStorageInfo",
-            "variableSetterType" : "EBSStorageInfo"
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "tagKeys",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
+      "required" : [ "TagKeys", "ResourceArn" ],
+      "shapeName" : "UntagResourceRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "UntagResourceRequest",
+        "variableName" : "untagResourceRequest",
+        "variableType" : "UntagResourceRequest",
+        "documentation" : null,
+        "simpleType" : "UntagResourceRequest",
+        "variableSetterType" : "UntagResourceRequest"
+      },
+      "wrapper" : false
+    },
+    "UntagResourceResult" : {
+      "c2jName" : "UntagResourceResult",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : null,
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "StorageInfo",
+      "shapeName" : "UntagResourceResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -18559,17 +27507,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "StorageInfo",
-        "variableName" : "storageInfo",
-        "variableType" : "StorageInfo",
+        "variableDeclarationType" : "UntagResourceResult",
+        "variableName" : "untagResourceResult",
+        "variableType" : "UntagResourceResult",
         "documentation" : null,
-        "simpleType" : "StorageInfo",
-        "variableSetterType" : "StorageInfo"
+        "simpleType" : "UntagResourceResult",
+        "variableSetterType" : "UntagResourceResult"
       },
       "wrapper" : false
     },
-    "TagResourceRequest" : {
-      "c2jName" : "TagResourceRequest",
+    "UpdateBrokerStorageRequest" : {
+      "c2jName" : "UpdateBrokerStorageRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -18586,23 +27534,23 @@
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : {
-        "action" : "TagResource",
+        "action" : "UpdateBrokerStorage",
         "locationName" : null,
-        "requestUri" : "/v1/tags/{resourceArn}",
+        "requestUri" : "/v1/clusters/{clusterArn}/nodes/storage",
         "target" : null,
-        "verb" : "POST",
+        "verb" : "PUT",
         "xmlNameSpaceUri" : null
       },
       "members" : [ {
-        "c2jName" : "ResourceArn",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withResourceArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-        "getterMethodName" : "getResourceArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -18617,11 +27565,11 @@
           "isStreaming" : false,
           "location" : "uri",
           "marshallLocation" : "PATH",
-          "marshallLocationName" : "resourceArn",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "resourceArn",
+          "unmarshallLocationName" : "clusterArn",
           "uri" : true
         },
         "idempotencyToken" : false,
@@ -18633,14 +27581,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ResourceArn",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-        "setterMethodName" : "setResourceArn",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "resourceArn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -18649,29 +27597,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "resourceArn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "Tags",
-        "c2jShape" : "__mapOf__string",
+        "c2jName" : "CurrentVersion",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The key-value pairs for the resource tags</p>",
+        "documentation" : "\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withTags",
-        "getterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@return The key-value pairs for the resource tags*/",
-        "getterMethodName" : "getTags",
+        "fluentSetterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@param currentVersion <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCurrentVersion",
+        "getterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@return <p>The version of cluster to update from. A successful operation will then generate a new version.</p>*/",
+        "getterMethodName" : "getCurrentVersion",
         "getterModel" : {
-          "returnType" : "java.util.Map<String,String>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -18684,11 +27632,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "tags",
+          "marshallLocationName" : "currentVersion",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "tags",
+          "unmarshallLocationName" : "currentVersion",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -18696,26 +27644,87 @@
         "jsonValue" : false,
         "list" : false,
         "listModel" : null,
-        "map" : true,
-        "mapModel" : {
-          "implType" : "java.util.HashMap",
-          "interfaceType" : "java.util.Map",
-          "keyLocationName" : "key",
-          "keyModel" : null,
-          "keyType" : "String",
-          "valueLocationName" : "value",
-          "valueModel" : {
-            "c2jName" : "value",
-            "c2jShape" : "__string",
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "CurrentVersion",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@param currentVersion <p>The version of cluster to update from. A successful operation will then generate a new version.</p>*/",
+        "setterMethodName" : "setCurrentVersion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "currentVersion",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@param currentVersion <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "currentVersion",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "TargetBrokerEBSVolumeInfo",
+        "c2jShape" : "__listOfBrokerEBSVolumeInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n@param targetBrokerEBSVolumeInfo <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTargetBrokerEBSVolumeInfo",
+        "getterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n@return <p>Describes the target volume size and the ID of the broker to apply the update to.</p>*/",
+        "getterMethodName" : "getTargetBrokerEBSVolumeInfo",
+        "getterModel" : {
+          "returnType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "targetBrokerEBSVolumeInfo",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "targetBrokerEBSVolumeInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "BrokerEBSVolumeInfo",
             "deprecated" : false,
             "documentation" : "",
             "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withValue",
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
             "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getValue",
+            "getterMethodName" : "getMember",
             "getterModel" : {
-              "returnType" : "String",
+              "returnType" : "BrokerEBSVolumeInfo",
               "documentation" : null
             },
             "http" : {
@@ -18728,11 +27737,11 @@
               "isStreaming" : false,
               "location" : null,
               "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "value",
+              "marshallLocationName" : "member",
               "queryString" : false,
               "requiresLength" : false,
               "statusCode" : false,
-              "unmarshallLocationName" : "value",
+              "unmarshallLocationName" : "member",
               "uri" : false
             },
             "idempotencyToken" : false,
@@ -18742,85 +27751,91 @@
             "listModel" : null,
             "map" : false,
             "mapModel" : null,
-            "marshallingTargetClass" : "String",
-            "marshallingType" : "STRING",
-            "name" : "Value",
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
             "sensitive" : false,
-            "setterDocumentation" : "/**\n@param value */",
-            "setterMethodName" : "setValue",
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
             "setterModel" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "value",
-              "variableType" : "String",
+              "variableDeclarationType" : "BrokerEBSVolumeInfo",
+              "variableName" : "member",
+              "variableType" : "BrokerEBSVolumeInfo",
               "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
+              "simpleType" : "BrokerEBSVolumeInfo",
+              "variableSetterType" : "BrokerEBSVolumeInfo"
             },
             "shouldEmitLegacyEnumSetter" : false,
-            "simple" : true,
+            "simple" : false,
             "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "value",
-              "variableType" : "String",
+              "variableDeclarationType" : "BrokerEBSVolumeInfo",
+              "variableName" : "member",
+              "variableType" : "BrokerEBSVolumeInfo",
               "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
+              "simpleType" : "BrokerEBSVolumeInfo",
+              "variableSetterType" : "BrokerEBSVolumeInfo"
             },
             "xmlNameSpaceUri" : null
           },
-          "valueType" : "String",
-          "entryType" : "Map.Entry<String, String>",
-          "keySimple" : true,
-          "templateImplType" : "java.util.HashMap<String,String>",
-          "templateType" : "java.util.Map<String,String>",
-          "valueList" : false,
-          "valueSimple" : true
+          "memberLocationName" : null,
+          "memberType" : "BrokerEBSVolumeInfo",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "BrokerEBSVolumeInfo",
+          "templateImplType" : "java.util.ArrayList<BrokerEBSVolumeInfo>",
+          "templateType" : "java.util.List<BrokerEBSVolumeInfo>"
         },
-        "marshallingTargetClass" : "Map",
-        "marshallingType" : "MAP",
-        "name" : "Tags",
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "TargetBrokerEBSVolumeInfo",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags*/",
-        "setterMethodName" : "setTags",
+        "setterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n@param targetBrokerEBSVolumeInfo <p>Describes the target volume size and the ID of the broker to apply the update to.</p>*/",
+        "setterMethodName" : "setTargetBrokerEBSVolumeInfo",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Map<String,String>",
-          "variableName" : "tags",
-          "variableType" : "java.util.Map<String,String>",
+          "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "variableName" : "targetBrokerEBSVolumeInfo",
+          "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
           "documentation" : "",
-          "simpleType" : "Map<String,String>",
-          "variableSetterType" : "java.util.Map<String,String>"
+          "simpleType" : "List<BrokerEBSVolumeInfo>",
+          "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTargetBrokerEBSVolumeInfo(java.util.Collection)} or {@link #withTargetBrokerEBSVolumeInfo(java.util.Collection)} if you want to override the existing values.</p>\n@param targetBrokerEBSVolumeInfo <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.Map<String,String>",
-          "variableName" : "tags",
-          "variableType" : "java.util.Map<String,String>",
-          "documentation" : "<p>The key-value pairs for the resource tags</p>",
-          "simpleType" : "Map<String,String>",
-          "variableSetterType" : "java.util.Map<String,String>"
+          "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "variableName" : "targetBrokerEBSVolumeInfo",
+          "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
+          "documentation" : "\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         ",
+          "simpleType" : "List<BrokerEBSVolumeInfo>",
+          "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ResourceArn" : {
-          "c2jName" : "ResourceArn",
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResourceArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-          "getterMethodName" : "getResourceArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -18835,11 +27850,11 @@
             "isStreaming" : false,
             "location" : "uri",
             "marshallLocation" : "PATH",
-            "marshallLocationName" : "resourceArn",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "resourceArn",
+            "unmarshallLocationName" : "clusterArn",
             "uri" : true
           },
           "idempotencyToken" : false,
@@ -18851,14 +27866,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ResourceArn",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-          "setterMethodName" : "setResourceArn",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceArn",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -18867,30 +27882,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceArn",
+            "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "Tags" : {
-          "c2jName" : "Tags",
-          "c2jShape" : "__mapOf__string",
+        "CurrentVersion" : {
+          "c2jName" : "CurrentVersion",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The key-value pairs for the resource tags</p>",
+          "documentation" : "\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTags",
-          "getterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@return The key-value pairs for the resource tags*/",
-          "getterMethodName" : "getTags",
+          "fluentSetterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@param currentVersion <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCurrentVersion",
+          "getterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@return <p>The version of cluster to update from. A successful operation will then generate a new version.</p>*/",
+          "getterMethodName" : "getCurrentVersion",
           "getterModel" : {
-            "returnType" : "java.util.Map<String,String>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -18903,11 +27918,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "tags",
+            "marshallLocationName" : "currentVersion",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "tags",
+            "unmarshallLocationName" : "currentVersion",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -18915,26 +27930,88 @@
           "jsonValue" : false,
           "list" : false,
           "listModel" : null,
-          "map" : true,
-          "mapModel" : {
-            "implType" : "java.util.HashMap",
-            "interfaceType" : "java.util.Map",
-            "keyLocationName" : "key",
-            "keyModel" : null,
-            "keyType" : "String",
-            "valueLocationName" : "value",
-            "valueModel" : {
-              "c2jName" : "value",
-              "c2jShape" : "__string",
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "CurrentVersion",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@param currentVersion <p>The version of cluster to update from. A successful operation will then generate a new version.</p>*/",
+          "setterMethodName" : "setCurrentVersion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "currentVersion",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         \n@param currentVersion <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "currentVersion",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TargetBrokerEBSVolumeInfo" : {
+          "c2jName" : "TargetBrokerEBSVolumeInfo",
+          "c2jShape" : "__listOfBrokerEBSVolumeInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n@param targetBrokerEBSVolumeInfo <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTargetBrokerEBSVolumeInfo",
+          "getterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n@return <p>Describes the target volume size and the ID of the broker to apply the update to.</p>*/",
+          "getterMethodName" : "getTargetBrokerEBSVolumeInfo",
+          "getterModel" : {
+            "returnType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "targetBrokerEBSVolumeInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "targetBrokerEBSVolumeInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "BrokerEBSVolumeInfo",
               "deprecated" : false,
               "documentation" : "",
               "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withValue",
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
               "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getValue",
+              "getterMethodName" : "getMember",
               "getterModel" : {
-                "returnType" : "String",
+                "returnType" : "BrokerEBSVolumeInfo",
                 "documentation" : null
               },
               "http" : {
@@ -18947,11 +28024,11 @@
                 "isStreaming" : false,
                 "location" : null,
                 "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "value",
+                "marshallLocationName" : "member",
                 "queryString" : false,
                 "requiresLength" : false,
                 "statusCode" : false,
-                "unmarshallLocationName" : "value",
+                "unmarshallLocationName" : "member",
                 "uri" : false
               },
               "idempotencyToken" : false,
@@ -18961,95 +28038,101 @@
               "listModel" : null,
               "map" : false,
               "mapModel" : null,
-              "marshallingTargetClass" : "String",
-              "marshallingType" : "STRING",
-              "name" : "Value",
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
               "sensitive" : false,
-              "setterDocumentation" : "/**\n@param value */",
-              "setterMethodName" : "setValue",
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
               "setterModel" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "value",
-                "variableType" : "String",
+                "variableDeclarationType" : "BrokerEBSVolumeInfo",
+                "variableName" : "member",
+                "variableType" : "BrokerEBSVolumeInfo",
                 "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
+                "simpleType" : "BrokerEBSVolumeInfo",
+                "variableSetterType" : "BrokerEBSVolumeInfo"
               },
               "shouldEmitLegacyEnumSetter" : false,
-              "simple" : true,
+              "simple" : false,
               "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param value \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
               "variable" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "value",
-                "variableType" : "String",
+                "variableDeclarationType" : "BrokerEBSVolumeInfo",
+                "variableName" : "member",
+                "variableType" : "BrokerEBSVolumeInfo",
                 "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
+                "simpleType" : "BrokerEBSVolumeInfo",
+                "variableSetterType" : "BrokerEBSVolumeInfo"
               },
               "xmlNameSpaceUri" : null
             },
-            "valueType" : "String",
-            "entryType" : "Map.Entry<String, String>",
-            "keySimple" : true,
-            "templateImplType" : "java.util.HashMap<String,String>",
-            "templateType" : "java.util.Map<String,String>",
-            "valueList" : false,
-            "valueSimple" : true
+            "memberLocationName" : null,
+            "memberType" : "BrokerEBSVolumeInfo",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "BrokerEBSVolumeInfo",
+            "templateImplType" : "java.util.ArrayList<BrokerEBSVolumeInfo>",
+            "templateType" : "java.util.List<BrokerEBSVolumeInfo>"
           },
-          "marshallingTargetClass" : "Map",
-          "marshallingType" : "MAP",
-          "name" : "Tags",
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "TargetBrokerEBSVolumeInfo",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags*/",
-          "setterMethodName" : "setTags",
+          "setterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n@param targetBrokerEBSVolumeInfo <p>Describes the target volume size and the ID of the broker to apply the update to.</p>*/",
+          "setterMethodName" : "setTargetBrokerEBSVolumeInfo",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Map<String,String>",
-            "variableName" : "tags",
-            "variableType" : "java.util.Map<String,String>",
+            "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "variableName" : "targetBrokerEBSVolumeInfo",
+            "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
             "documentation" : "",
-            "simpleType" : "Map<String,String>",
-            "variableSetterType" : "java.util.Map<String,String>"
+            "simpleType" : "List<BrokerEBSVolumeInfo>",
+            "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The key-value pairs for the resource tags</p>\n@param tags The key-value pairs for the resource tags\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTargetBrokerEBSVolumeInfo(java.util.Collection)} or {@link #withTargetBrokerEBSVolumeInfo(java.util.Collection)} if you want to override the existing values.</p>\n@param targetBrokerEBSVolumeInfo <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.Map<String,String>",
-            "variableName" : "tags",
-            "variableType" : "java.util.Map<String,String>",
-            "documentation" : "<p>The key-value pairs for the resource tags</p>",
-            "simpleType" : "Map<String,String>",
-            "variableSetterType" : "java.util.Map<String,String>"
+            "variableDeclarationType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "variableName" : "targetBrokerEBSVolumeInfo",
+            "variableType" : "java.util.List<BrokerEBSVolumeInfo>",
+            "documentation" : "\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         ",
+            "simpleType" : "List<BrokerEBSVolumeInfo>",
+            "variableSetterType" : "java.util.Collection<BrokerEBSVolumeInfo>"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "ResourceArn", "Tags" ],
-      "shapeName" : "TagResourceRequest",
+      "required" : [ "ClusterArn", "TargetBrokerEBSVolumeInfo", "CurrentVersion" ],
+      "shapeName" : "UpdateBrokerStorageRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "TagResourceRequest",
-        "variableName" : "tagResourceRequest",
-        "variableType" : "TagResourceRequest",
+        "variableDeclarationType" : "UpdateBrokerStorageRequest",
+        "variableName" : "updateBrokerStorageRequest",
+        "variableType" : "UpdateBrokerStorageRequest",
         "documentation" : null,
-        "simpleType" : "TagResourceRequest",
-        "variableSetterType" : "TagResourceRequest"
+        "simpleType" : "UpdateBrokerStorageRequest",
+        "variableSetterType" : "UpdateBrokerStorageRequest"
       },
       "wrapper" : false
     },
-    "TagResourceResult" : {
-      "c2jName" : "TagResourceResult",
+    "UpdateBrokerStorageResult" : {
+      "c2jName" : "UpdateBrokerStorageResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -19057,7 +28140,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : null,
+      "documentation" : "",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -19066,57 +28149,16 @@
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "TagResourceResult",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "TagResourceResult",
-        "variableName" : "tagResourceResult",
-        "variableType" : "TagResourceResult",
-        "documentation" : null,
-        "simpleType" : "TagResourceResult",
-        "variableSetterType" : "TagResourceResult"
-      },
-      "wrapper" : false
-    },
-    "TooManyRequestsException" : {
-      "c2jName" : "TooManyRequestsException",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
-      "enums" : null,
-      "errorCode" : "TooManyRequestsException",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "InvalidParameter",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-        "getterMethodName" : "getInvalidParameter",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -19131,11 +28173,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "invalidParameter",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "invalidParameter",
+          "unmarshallLocationName" : "clusterArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -19147,14 +28189,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "InvalidParameter",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-        "setterMethodName" : "setInvalidParameter",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -19163,29 +28205,164 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ClusterOperationArn",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterOperationArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+        "getterMethodName" : "getClusterOperationArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterOperationArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterOperationArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterOperationArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+        "setterMethodName" : "setClusterOperationArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterOperationArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterOperationArn",
           "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "InvalidParameter" : {
-          "c2jName" : "InvalidParameter",
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clusterArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ClusterOperationArn" : {
+          "c2jName" : "ClusterOperationArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-          "getterMethodName" : "getInvalidParameter",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterOperationArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+          "getterMethodName" : "getClusterOperationArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -19200,11 +28377,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "invalidParameter",
+            "marshallLocationName" : "clusterOperationArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "invalidParameter",
+            "unmarshallLocationName" : "clusterOperationArn",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -19216,14 +28393,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "InvalidParameter",
+          "name" : "ClusterOperationArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-          "setterMethodName" : "setInvalidParameter",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+          "setterMethodName" : "setClusterOperationArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
+            "variableName" : "clusterOperationArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -19232,13 +28409,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
+            "variableName" : "clusterOperationArn",
             "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -19248,23 +28425,26 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "TooManyRequestsException",
+      "shapeName" : "UpdateBrokerStorageResult",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "TooManyRequestsException",
-        "variableName" : "tooManyRequestsException",
-        "variableType" : "TooManyRequestsException",
+        "variableDeclarationType" : "UpdateBrokerStorageResult",
+        "variableName" : "updateBrokerStorageResult",
+        "variableType" : "UpdateBrokerStorageResult",
         "documentation" : null,
-        "simpleType" : "TooManyRequestsException",
-        "variableSetterType" : "TooManyRequestsException"
+        "simpleType" : "UpdateBrokerStorageResult",
+        "variableSetterType" : "UpdateBrokerStorageResult"
       },
       "wrapper" : false
     },
-    "UnauthorizedException" : {
-      "c2jName" : "UnauthorizedException",
+    "UpdateClusterConfigurationRequest" : {
+      "c2jName" : "UpdateClusterConfigurationRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -19272,29 +28452,103 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "",
       "enums" : null,
-      "errorCode" : "UnauthorizedException",
+      "errorCode" : null,
       "hasHeaderMember" : false,
       "hasPayloadMember" : false,
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "UpdateClusterConfiguration",
+        "locationName" : null,
+        "requestUri" : "/v1/clusters/{clusterArn}/configuration",
+        "target" : null,
+        "verb" : "PUT",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "InvalidParameter",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The parameter that caused the error.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withInvalidParameter",
-        "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-        "getterMethodName" : "getInvalidParameter",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
         },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : "uri",
+          "marshallLocation" : "PATH",
+          "marshallLocationName" : "clusterArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clusterArn",
+          "uri" : true
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ConfigurationInfo",
+        "c2jShape" : "ConfigurationInfo",
+        "deprecated" : false,
+        "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withConfigurationInfo",
+        "getterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@return <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+        "getterMethodName" : "getConfigurationInfo",
+        "getterModel" : {
+          "returnType" : "ConfigurationInfo",
+          "documentation" : null
+        },
         "http" : {
           "additionalMarshallingPath" : null,
           "additionalUnmarshallingPath" : null,
@@ -19305,11 +28559,78 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "invalidParameter",
+          "marshallLocationName" : "configurationInfo",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "invalidParameter",
+          "unmarshallLocationName" : "configurationInfo",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ConfigurationInfo",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+        "setterMethodName" : "setConfigurationInfo",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationInfo",
+          "variableName" : "configurationInfo",
+          "variableType" : "ConfigurationInfo",
+          "documentation" : "",
+          "simpleType" : "ConfigurationInfo",
+          "variableSetterType" : "ConfigurationInfo"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ConfigurationInfo",
+          "variableName" : "configurationInfo",
+          "variableType" : "ConfigurationInfo",
+          "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+          "simpleType" : "ConfigurationInfo",
+          "variableSetterType" : "ConfigurationInfo"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "CurrentVersion",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The version of the cluster that needs to be updated.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@param currentVersion <p>The version of the cluster that needs to be updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withCurrentVersion",
+        "getterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@return <p>The version of the cluster that needs to be updated.</p>*/",
+        "getterMethodName" : "getCurrentVersion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "currentVersion",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "currentVersion",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -19321,14 +28642,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "InvalidParameter",
+        "name" : "CurrentVersion",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-        "setterMethodName" : "setInvalidParameter",
+        "setterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@param currentVersion <p>The version of the cluster that needs to be updated.</p>*/",
+        "setterMethodName" : "setCurrentVersion",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
+          "variableName" : "currentVersion",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -19337,29 +28658,165 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@param currentVersion <p>The version of the cluster that needs to be updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "invalidParameter",
+          "variableName" : "currentVersion",
           "variableType" : "String",
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The version of the cluster that needs to be updated.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "InvalidParameter" : {
-          "c2jName" : "InvalidParameter",
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
+          "c2jShape" : "__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : "uri",
+            "marshallLocation" : "PATH",
+            "marshallLocationName" : "clusterArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : true
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ConfigurationInfo" : {
+          "c2jName" : "ConfigurationInfo",
+          "c2jShape" : "ConfigurationInfo",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withConfigurationInfo",
+          "getterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@return <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+          "getterMethodName" : "getConfigurationInfo",
+          "getterModel" : {
+            "returnType" : "ConfigurationInfo",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "configurationInfo",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "configurationInfo",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ConfigurationInfo",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>*/",
+          "setterMethodName" : "setConfigurationInfo",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationInfo",
+            "variableName" : "configurationInfo",
+            "variableType" : "ConfigurationInfo",
+            "documentation" : "",
+            "simpleType" : "ConfigurationInfo",
+            "variableSetterType" : "ConfigurationInfo"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         \n@param configurationInfo <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "ConfigurationInfo",
+            "variableName" : "configurationInfo",
+            "variableType" : "ConfigurationInfo",
+            "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         ",
+            "simpleType" : "ConfigurationInfo",
+            "variableSetterType" : "ConfigurationInfo"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "CurrentVersion" : {
+          "c2jName" : "CurrentVersion",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The parameter that caused the error.</p>",
+          "documentation" : "\n            <p>The version of the cluster that needs to be updated.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withInvalidParameter",
-          "getterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@return The parameter that caused the error.*/",
-          "getterMethodName" : "getInvalidParameter",
+          "fluentSetterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@param currentVersion <p>The version of the cluster that needs to be updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withCurrentVersion",
+          "getterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@return <p>The version of the cluster that needs to be updated.</p>*/",
+          "getterMethodName" : "getCurrentVersion",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -19374,11 +28831,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "invalidParameter",
+            "marshallLocationName" : "currentVersion",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "invalidParameter",
+            "unmarshallLocationName" : "currentVersion",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -19390,14 +28847,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "InvalidParameter",
+          "name" : "CurrentVersion",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.*/",
-          "setterMethodName" : "setInvalidParameter",
+          "setterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@param currentVersion <p>The version of the cluster that needs to be updated.</p>*/",
+          "setterMethodName" : "setCurrentVersion",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
+            "variableName" : "currentVersion",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -19406,13 +28863,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The parameter that caused the error.</p>\n@param invalidParameter The parameter that caused the error.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The version of the cluster that needs to be updated.</p>\n         \n@param currentVersion <p>The version of the cluster that needs to be updated.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "invalidParameter",
+            "variableName" : "currentVersion",
             "variableType" : "String",
-            "documentation" : "<p>The parameter that caused the error.</p>",
+            "documentation" : "\n            <p>The version of the cluster that needs to be updated.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -19421,24 +28878,24 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "UnauthorizedException",
+      "required" : [ "ClusterArn", "CurrentVersion", "ConfigurationInfo" ],
+      "shapeName" : "UpdateClusterConfigurationRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "UnauthorizedException",
-        "variableName" : "unauthorizedException",
-        "variableType" : "UnauthorizedException",
+        "variableDeclarationType" : "UpdateClusterConfigurationRequest",
+        "variableName" : "updateClusterConfigurationRequest",
+        "variableType" : "UpdateClusterConfigurationRequest",
         "documentation" : null,
-        "simpleType" : "UnauthorizedException",
-        "variableSetterType" : "UnauthorizedException"
+        "simpleType" : "UpdateClusterConfigurationRequest",
+        "variableSetterType" : "UpdateClusterConfigurationRequest"
       },
       "wrapper" : false
     },
-    "UntagResourceRequest" : {
-      "c2jName" : "UntagResourceRequest",
+    "UpdateClusterConfigurationResult" : {
+      "c2jName" : "UpdateClusterConfigurationResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -19454,24 +28911,17 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "UntagResource",
-        "locationName" : null,
-        "requestUri" : "/v1/tags/{resourceArn}",
-        "target" : null,
-        "verb" : "DELETE",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ResourceArn",
+        "c2jName" : "ClusterArn",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withResourceArn",
-        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-        "getterMethodName" : "getResourceArn",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+        "getterMethodName" : "getClusterArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -19484,14 +28934,14 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "uri",
-          "marshallLocation" : "PATH",
-          "marshallLocationName" : "resourceArn",
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "resourceArn",
-          "uri" : true
+          "unmarshallLocationName" : "clusterArn",
+          "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
@@ -19502,14 +28952,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ResourceArn",
+        "name" : "ClusterArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-        "setterMethodName" : "setResourceArn",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+        "setterMethodName" : "setClusterArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "resourceArn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -19518,29 +28968,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "resourceArn",
+          "variableName" : "clusterArn",
           "variableType" : "String",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "TagKeys",
-        "c2jShape" : "__listOf__string",
+        "c2jName" : "ClusterOperationArn",
+        "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The list of tag keys.</p>",
+        "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The list of tag keys.</p>\n@param tagKeys The list of tag keys.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withTagKeys",
-        "getterDocumentation" : "/**<p>The list of tag keys.</p>\n@return The list of tag keys.*/",
-        "getterMethodName" : "getTagKeys",
+        "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClusterOperationArn",
+        "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+        "getterMethodName" : "getClusterOperationArn",
         "getterModel" : {
-          "returnType" : "java.util.List<String>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -19551,145 +29001,63 @@
           "header" : false,
           "isPayload" : false,
           "isStreaming" : false,
-          "location" : "querystring",
-          "marshallLocation" : "QUERY_PARAM",
-          "marshallLocationName" : "tagKeys",
-          "queryString" : true,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clusterOperationArn",
+          "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "tagKeys",
+          "unmarshallLocationName" : "clusterOperationArn",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "__string",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "String",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "String",
-            "marshallingType" : "STRING",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "member",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : true,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "String",
-              "variableName" : "member",
-              "variableType" : "String",
-              "documentation" : "",
-              "simpleType" : "String",
-              "variableSetterType" : "String"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "String",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : true,
-          "simpleType" : "String",
-          "templateImplType" : "java.util.ArrayList<String>",
-          "templateType" : "java.util.List<String>"
-        },
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "TagKeys",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClusterOperationArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The list of tag keys.</p>\n@param tagKeys The list of tag keys.*/",
-        "setterMethodName" : "setTagKeys",
+        "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+        "setterMethodName" : "setClusterOperationArn",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "tagKeys",
-          "variableType" : "java.util.List<String>",
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterOperationArn",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The list of tag keys.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys The list of tag keys.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<String>",
-          "variableName" : "tagKeys",
-          "variableType" : "java.util.List<String>",
-          "documentation" : "<p>The list of tag keys.</p>",
-          "simpleType" : "List<String>",
-          "variableSetterType" : "java.util.Collection<String>"
+          "variableDeclarationType" : "String",
+          "variableName" : "clusterOperationArn",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ResourceArn" : {
-          "c2jName" : "ResourceArn",
+        "ClusterArn" : {
+          "c2jName" : "ClusterArn",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResourceArn",
-          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@return The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-          "getterMethodName" : "getResourceArn",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+          "getterMethodName" : "getClusterArn",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -19702,14 +29070,14 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "uri",
-            "marshallLocation" : "PATH",
-            "marshallLocationName" : "resourceArn",
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clusterArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "resourceArn",
-            "uri" : true
+            "unmarshallLocationName" : "clusterArn",
+            "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
@@ -19720,14 +29088,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ResourceArn",
+          "name" : "ClusterArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.*/",
-          "setterMethodName" : "setResourceArn",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>*/",
+          "setterMethodName" : "setClusterArn",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceArn",
+            "variableName" : "clusterArn",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -19736,30 +29104,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>\n@param resourceArn The Amazon Resource Name (ARN) that uniquely identifies the resource.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         \n@param clusterArn <p>The Amazon Resource Name (ARN) of the cluster.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceArn",
+            "variableName" : "clusterArn",
             "variableType" : "String",
-            "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "TagKeys" : {
-          "c2jName" : "TagKeys",
-          "c2jShape" : "__listOf__string",
+        "ClusterOperationArn" : {
+          "c2jName" : "ClusterOperationArn",
+          "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The list of tag keys.</p>",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The list of tag keys.</p>\n@param tagKeys The list of tag keys.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTagKeys",
-          "getterDocumentation" : "/**<p>The list of tag keys.</p>\n@return The list of tag keys.*/",
-          "getterMethodName" : "getTagKeys",
+          "fluentSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withClusterOperationArn",
+          "getterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@return <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+          "getterMethodName" : "getClusterOperationArn",
           "getterModel" : {
-            "returnType" : "java.util.List<String>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -19770,177 +29138,57 @@
             "header" : false,
             "isPayload" : false,
             "isStreaming" : false,
-            "location" : "querystring",
-            "marshallLocation" : "QUERY_PARAM",
-            "marshallLocationName" : "tagKeys",
-            "queryString" : true,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "clusterOperationArn",
+            "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "tagKeys",
+            "unmarshallLocationName" : "clusterOperationArn",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "__string",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "String",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "String",
-              "marshallingType" : "STRING",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : true,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "String",
-                "variableName" : "member",
-                "variableType" : "String",
-                "documentation" : "",
-                "simpleType" : "String",
-                "variableSetterType" : "String"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "String",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : true,
-            "simpleType" : "String",
-            "templateImplType" : "java.util.ArrayList<String>",
-            "templateType" : "java.util.List<String>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "TagKeys",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ClusterOperationArn",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The list of tag keys.</p>\n@param tagKeys The list of tag keys.*/",
-          "setterMethodName" : "setTagKeys",
+          "setterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>*/",
+          "setterMethodName" : "setClusterOperationArn",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "tagKeys",
-            "variableType" : "java.util.List<String>",
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterOperationArn",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The list of tag keys.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setTagKeys(java.util.Collection)} or {@link #withTagKeys(java.util.Collection)} if you want to override the existing values.</p>\n@param tagKeys The list of tag keys.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         \n@param clusterOperationArn <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<String>",
-            "variableName" : "tagKeys",
-            "variableType" : "java.util.List<String>",
-            "documentation" : "<p>The list of tag keys.</p>",
-            "simpleType" : "List<String>",
-            "variableSetterType" : "java.util.Collection<String>"
+            "variableDeclarationType" : "String",
+            "variableName" : "clusterOperationArn",
+            "variableType" : "String",
+            "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         ",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "TagKeys", "ResourceArn" ],
-      "shapeName" : "UntagResourceRequest",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "UntagResourceRequest",
-        "variableName" : "untagResourceRequest",
-        "variableType" : "UntagResourceRequest",
-        "documentation" : null,
-        "simpleType" : "UntagResourceRequest",
-        "variableSetterType" : "UntagResourceRequest"
-      },
-      "wrapper" : false
-    },
-    "UntagResourceResult" : {
-      "c2jName" : "UntagResourceResult",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : null,
-      "enums" : null,
-      "errorCode" : null,
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "UntagResourceResult",
+      "shapeName" : "UpdateClusterConfigurationResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -19949,12 +29197,12 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "UntagResourceResult",
-        "variableName" : "untagResourceResult",
-        "variableType" : "UntagResourceResult",
+        "variableDeclarationType" : "UpdateClusterConfigurationResult",
+        "variableName" : "updateClusterConfigurationResult",
+        "variableType" : "UpdateClusterConfigurationResult",
         "documentation" : null,
-        "simpleType" : "UntagResourceResult",
-        "variableSetterType" : "UntagResourceResult"
+        "simpleType" : "UpdateClusterConfigurationResult",
+        "variableSetterType" : "UpdateClusterConfigurationResult"
       },
       "wrapper" : false
     },
@@ -19967,7 +29215,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "<p>Zookeeper node information.</p>",
+      "documentation" : "\n            <p>Zookeeper node information.</p>\n         ",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -19980,11 +29228,11 @@
         "c2jName" : "AttachedENIId",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+        "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withAttachedENIId",
-        "getterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@return The attached elastic network interface of the broker.*/",
+        "getterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@return <p>The attached elastic network interface of the broker.</p>*/",
         "getterMethodName" : "getAttachedENIId",
         "getterModel" : {
           "returnType" : "String",
@@ -20018,7 +29266,7 @@
         "marshallingType" : "STRING",
         "name" : "AttachedENIId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.*/",
+        "setterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>*/",
         "setterMethodName" : "setAttachedENIId",
         "setterModel" : {
           "timestampFormat" : null,
@@ -20032,29 +29280,96 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "attachedENIId",
           "variableType" : "String",
-          "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+          "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ClientVpcIpAddress",
+        "c2jShape" : "__string",
+        "deprecated" : false,
+        "documentation" : "\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         ",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) IP address of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withClientVpcIpAddress",
+        "getterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@return <p>The virtual private cloud (VPC) IP address of the client.</p>*/",
+        "getterMethodName" : "getClientVpcIpAddress",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "clientVpcIpAddress",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "clientVpcIpAddress",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ClientVpcIpAddress",
+        "sensitive" : false,
+        "setterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) IP address of the client.</p>*/",
+        "setterMethodName" : "setClientVpcIpAddress",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clientVpcIpAddress",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) IP address of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "clientVpcIpAddress",
+          "variableType" : "String",
+          "documentation" : "\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "ClientVpcIpAddress",
-        "c2jShape" : "__string",
+        "c2jName" : "Endpoints",
+        "c2jShape" : "__listOf__string",
         "deprecated" : false,
-        "documentation" : "<p>The virtual private cloud (VPC) IP address of the client.</p>",
+        "documentation" : "\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) IP address of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withClientVpcIpAddress",
-        "getterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@return The virtual private cloud (VPC) IP address of the client.*/",
-        "getterMethodName" : "getClientVpcIpAddress",
+        "fluentSetterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n@param endpoints <p>Endpoints for accessing the ZooKeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withEndpoints",
+        "getterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n@return <p>Endpoints for accessing the ZooKeeper.</p>*/",
+        "getterMethodName" : "getEndpoints",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "java.util.List<String>",
           "documentation" : null
         },
         "http" : {
@@ -20067,58 +29382,140 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "clientVpcIpAddress",
+          "marshallLocationName" : "endpoints",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "clientVpcIpAddress",
+          "unmarshallLocationName" : "endpoints",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "__string",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "String",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "String",
+            "marshallingType" : "STRING",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : true,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "String",
+              "variableName" : "member",
+              "variableType" : "String",
+              "documentation" : "",
+              "simpleType" : "String",
+              "variableSetterType" : "String"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "String",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : true,
+          "simpleType" : "String",
+          "templateImplType" : "java.util.ArrayList<String>",
+          "templateType" : "java.util.List<String>"
+        },
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "ClientVpcIpAddress",
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Endpoints",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) IP address of the client.*/",
-        "setterMethodName" : "setClientVpcIpAddress",
+        "setterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n@param endpoints <p>Endpoints for accessing the ZooKeeper.</p>*/",
+        "setterMethodName" : "setEndpoints",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clientVpcIpAddress",
-          "variableType" : "String",
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "endpoints",
+          "variableType" : "java.util.List<String>",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) IP address of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEndpoints(java.util.Collection)} or {@link #withEndpoints(java.util.Collection)} if you want to override the existing values.</p>\n@param endpoints <p>Endpoints for accessing the ZooKeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "clientVpcIpAddress",
-          "variableType" : "String",
-          "documentation" : "<p>The virtual private cloud (VPC) IP address of the client.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "java.util.List<String>",
+          "variableName" : "endpoints",
+          "variableType" : "java.util.List<String>",
+          "documentation" : "\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         ",
+          "simpleType" : "List<String>",
+          "variableSetterType" : "java.util.Collection<String>"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "ZookeeperId",
         "c2jShape" : "__double",
         "deprecated" : false,
-        "documentation" : "<p>The role-specific ID for Zookeeper.</p>",
+        "documentation" : "\n            <p>The role-specific ID for Zookeeper.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@param zookeeperId The role-specific ID for Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@param zookeeperId <p>The role-specific ID for Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withZookeeperId",
-        "getterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@return The role-specific ID for Zookeeper.*/",
+        "getterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@return <p>The role-specific ID for Zookeeper.</p>*/",
         "getterMethodName" : "getZookeeperId",
         "getterModel" : {
           "returnType" : "Double",
@@ -20152,7 +29549,7 @@
         "marshallingType" : "DOUBLE",
         "name" : "ZookeeperId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@param zookeeperId The role-specific ID for Zookeeper.*/",
+        "setterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@param zookeeperId <p>The role-specific ID for Zookeeper.</p>*/",
         "setterMethodName" : "setZookeeperId",
         "setterModel" : {
           "timestampFormat" : null,
@@ -20166,13 +29563,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@param zookeeperId The role-specific ID for Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@param zookeeperId <p>The role-specific ID for Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Double",
           "variableName" : "zookeeperId",
           "variableType" : "Double",
-          "documentation" : "<p>The role-specific ID for Zookeeper.</p>",
+          "documentation" : "\n            <p>The role-specific ID for Zookeeper.</p>\n         ",
           "simpleType" : "Double",
           "variableSetterType" : "Double"
         },
@@ -20181,11 +29578,11 @@
         "c2jName" : "ZookeeperVersion",
         "c2jShape" : "__string",
         "deprecated" : false,
-        "documentation" : "<p>The version of Zookeeper.</p>",
+        "documentation" : "\n            <p>The version of Zookeeper.</p>\n         ",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@param zookeeperVersion The version of Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@param zookeeperVersion <p>The version of Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withZookeeperVersion",
-        "getterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@return The version of Zookeeper.*/",
+        "getterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@return <p>The version of Zookeeper.</p>*/",
         "getterMethodName" : "getZookeeperVersion",
         "getterModel" : {
           "returnType" : "String",
@@ -20219,7 +29616,7 @@
         "marshallingType" : "STRING",
         "name" : "ZookeeperVersion",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@param zookeeperVersion The version of Zookeeper.*/",
+        "setterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@param zookeeperVersion <p>The version of Zookeeper.</p>*/",
         "setterMethodName" : "setZookeeperVersion",
         "setterModel" : {
           "timestampFormat" : null,
@@ -20233,13 +29630,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@param zookeeperVersion The version of Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@param zookeeperVersion <p>The version of Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "zookeeperVersion",
           "variableType" : "String",
-          "documentation" : "<p>The version of Zookeeper.</p>",
+          "documentation" : "\n            <p>The version of Zookeeper.</p>\n         ",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -20250,11 +29647,11 @@
           "c2jName" : "AttachedENIId",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+          "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withAttachedENIId",
-          "getterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@return The attached elastic network interface of the broker.*/",
+          "getterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@return <p>The attached elastic network interface of the broker.</p>*/",
           "getterMethodName" : "getAttachedENIId",
           "getterModel" : {
             "returnType" : "String",
@@ -20288,7 +29685,7 @@
           "marshallingType" : "STRING",
           "name" : "AttachedENIId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.*/",
+          "setterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>*/",
           "setterMethodName" : "setAttachedENIId",
           "setterModel" : {
             "timestampFormat" : null,
@@ -20302,13 +29699,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The attached elastic network interface of the broker.</p>\n@param attachedENIId The attached elastic network interface of the broker.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The attached elastic network interface of the broker.</p>\n         \n@param attachedENIId <p>The attached elastic network interface of the broker.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "attachedENIId",
             "variableType" : "String",
-            "documentation" : "<p>The attached elastic network interface of the broker.</p>",
+            "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -20318,11 +29715,11 @@
           "c2jName" : "ClientVpcIpAddress",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The virtual private cloud (VPC) IP address of the client.</p>",
+          "documentation" : "\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) IP address of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) IP address of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withClientVpcIpAddress",
-          "getterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@return The virtual private cloud (VPC) IP address of the client.*/",
+          "getterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@return <p>The virtual private cloud (VPC) IP address of the client.</p>*/",
           "getterMethodName" : "getClientVpcIpAddress",
           "getterModel" : {
             "returnType" : "String",
@@ -20356,7 +29753,7 @@
           "marshallingType" : "STRING",
           "name" : "ClientVpcIpAddress",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) IP address of the client.*/",
+          "setterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) IP address of the client.</p>*/",
           "setterMethodName" : "setClientVpcIpAddress",
           "setterModel" : {
             "timestampFormat" : null,
@@ -20370,27 +29767,177 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The virtual private cloud (VPC) IP address of the client.</p>\n@param clientVpcIpAddress The virtual private cloud (VPC) IP address of the client.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         \n@param clientVpcIpAddress <p>The virtual private cloud (VPC) IP address of the client.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "clientVpcIpAddress",
             "variableType" : "String",
-            "documentation" : "<p>The virtual private cloud (VPC) IP address of the client.</p>",
+            "documentation" : "\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
+        "Endpoints" : {
+          "c2jName" : "Endpoints",
+          "c2jShape" : "__listOf__string",
+          "deprecated" : false,
+          "documentation" : "\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         ",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n@param endpoints <p>Endpoints for accessing the ZooKeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withEndpoints",
+          "getterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n@return <p>Endpoints for accessing the ZooKeeper.</p>*/",
+          "getterMethodName" : "getEndpoints",
+          "getterModel" : {
+            "returnType" : "java.util.List<String>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "endpoints",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "endpoints",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "__string",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "String",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "String",
+              "marshallingType" : "STRING",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : true,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "String",
+                "variableName" : "member",
+                "variableType" : "String",
+                "documentation" : "",
+                "simpleType" : "String",
+                "variableSetterType" : "String"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "String",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : true,
+            "simpleType" : "String",
+            "templateImplType" : "java.util.ArrayList<String>",
+            "templateType" : "java.util.List<String>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Endpoints",
+          "sensitive" : false,
+          "setterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n@param endpoints <p>Endpoints for accessing the ZooKeeper.</p>*/",
+          "setterMethodName" : "setEndpoints",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "endpoints",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         \n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setEndpoints(java.util.Collection)} or {@link #withEndpoints(java.util.Collection)} if you want to override the existing values.</p>\n@param endpoints <p>Endpoints for accessing the ZooKeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<String>",
+            "variableName" : "endpoints",
+            "variableType" : "java.util.List<String>",
+            "documentation" : "\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         ",
+            "simpleType" : "List<String>",
+            "variableSetterType" : "java.util.Collection<String>"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "ZookeeperId" : {
           "c2jName" : "ZookeeperId",
           "c2jShape" : "__double",
           "deprecated" : false,
-          "documentation" : "<p>The role-specific ID for Zookeeper.</p>",
+          "documentation" : "\n            <p>The role-specific ID for Zookeeper.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@param zookeeperId The role-specific ID for Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@param zookeeperId <p>The role-specific ID for Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withZookeeperId",
-          "getterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@return The role-specific ID for Zookeeper.*/",
+          "getterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@return <p>The role-specific ID for Zookeeper.</p>*/",
           "getterMethodName" : "getZookeeperId",
           "getterModel" : {
             "returnType" : "Double",
@@ -20424,7 +29971,7 @@
           "marshallingType" : "DOUBLE",
           "name" : "ZookeeperId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@param zookeeperId The role-specific ID for Zookeeper.*/",
+          "setterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@param zookeeperId <p>The role-specific ID for Zookeeper.</p>*/",
           "setterMethodName" : "setZookeeperId",
           "setterModel" : {
             "timestampFormat" : null,
@@ -20438,13 +29985,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The role-specific ID for Zookeeper.</p>\n@param zookeeperId The role-specific ID for Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The role-specific ID for Zookeeper.</p>\n         \n@param zookeeperId <p>The role-specific ID for Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Double",
             "variableName" : "zookeeperId",
             "variableType" : "Double",
-            "documentation" : "<p>The role-specific ID for Zookeeper.</p>",
+            "documentation" : "\n            <p>The role-specific ID for Zookeeper.</p>\n         ",
             "simpleType" : "Double",
             "variableSetterType" : "Double"
           },
@@ -20454,11 +30001,11 @@
           "c2jName" : "ZookeeperVersion",
           "c2jShape" : "__string",
           "deprecated" : false,
-          "documentation" : "<p>The version of Zookeeper.</p>",
+          "documentation" : "\n            <p>The version of Zookeeper.</p>\n         ",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@param zookeeperVersion The version of Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@param zookeeperVersion <p>The version of Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withZookeeperVersion",
-          "getterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@return The version of Zookeeper.*/",
+          "getterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@return <p>The version of Zookeeper.</p>*/",
           "getterMethodName" : "getZookeeperVersion",
           "getterModel" : {
             "returnType" : "String",
@@ -20492,7 +30039,7 @@
           "marshallingType" : "STRING",
           "name" : "ZookeeperVersion",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@param zookeeperVersion The version of Zookeeper.*/",
+          "setterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@param zookeeperVersion <p>The version of Zookeeper.</p>*/",
           "setterMethodName" : "setZookeeperVersion",
           "setterModel" : {
             "timestampFormat" : null,
@@ -20506,13 +30053,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The version of Zookeeper.</p>\n@param zookeeperVersion The version of Zookeeper.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**\n            <p>The version of Zookeeper.</p>\n         \n@param zookeeperVersion <p>The version of Zookeeper.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "zookeeperVersion",
             "variableType" : "String",
-            "documentation" : "<p>The version of Zookeeper.</p>",
+            "documentation" : "\n            <p>The version of Zookeeper.</p>\n         ",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
diff --git a/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-model.json b/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-model.json
index 119d5e3313ce..bdcc5b516aa5 100644
--- a/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/kafka-2018-11-14-model.json
@@ -27,27 +27,27 @@
       },
       "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       }, {
         "shape" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>"
+        "documentation" : "\n            <p>503 response</p>\n         "
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>429 response</p>"
+        "documentation" : "\n            <p>429 response</p>\n         "
       }, {
         "shape" : "ConflictException",
-        "documentation" : "<p>This cluster name already exists. Retry your request using another name.</p>"
+        "documentation" : "\n            <p>This cluster name already exists. Retry your request using another name.</p>\n         "
       } ],
-      "documentation" : "<p>Creates a new MSK cluster.</p>"
+      "documentation" : "\n            <p>Creates a new MSK cluster.</p>\n         "
     },
     "CreateConfiguration" : {
       "name" : "CreateConfiguration",
@@ -61,31 +61,31 @@
       },
       "output" : {
         "shape" : "CreateConfigurationResponse",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       }, {
         "shape" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>"
+        "documentation" : "\n            <p>503 response</p>\n         "
       }, {
         "shape" : "TooManyRequestsException",
-        "documentation" : "<p>429 response</p>"
+        "documentation" : "\n            <p>429 response</p>\n         "
       }, {
         "shape" : "ConflictException",
-        "documentation" : "<p>This configuration name already exists. Retry your request using another name.</p>"
+        "documentation" : "\n            <p>This cluster name already exists. Retry your request using another name.</p>\n         "
       } ],
-      "documentation" : "<p>Creates a new MSK configuration.</p>"
+      "documentation" : "\n            <p>Creates a new MSK configuration.</p>\n         "
     },
     "DeleteCluster" : {
       "name" : "DeleteCluster",
@@ -99,22 +99,22 @@
       },
       "output" : {
         "shape" : "DeleteClusterResponse",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "errors" : [ {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       } ],
-      "documentation" : "<p>Deletes the MSK cluster specified by the Amazon Resource Name (ARN) in the request.</p>"
+      "documentation" : "\n            <p>Deletes the MSK cluster specified by the Amazon Resource Name (ARN) in the request.</p>\n         "
     },
     "DescribeCluster" : {
       "name" : "DescribeCluster",
@@ -128,25 +128,57 @@
       },
       "output" : {
         "shape" : "DescribeClusterResponse",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "errors" : [ {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       } ],
-      "documentation" : "<p>Returns a description of the MSK cluster whose Amazon Resource Name (ARN) is specified in the request.</p>"
+      "documentation" : "\n            <p>Returns a description of the MSK cluster whose Amazon Resource Name (ARN) is specified in the request.</p>\n         "
+    },
+    "DescribeClusterOperation" : {
+      "name" : "DescribeClusterOperation",
+      "http" : {
+        "method" : "GET",
+        "requestUri" : "/v1/operations/{clusterOperationArn}",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "DescribeClusterOperationRequest"
+      },
+      "output" : {
+        "shape" : "DescribeClusterOperationResponse",
+        "documentation" : "\n            <p>200 response</p>\n         "
+      },
+      "errors" : [ {
+        "shape" : "NotFoundException",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
+      }, {
+        "shape" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
+      }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+      } ],
+      "documentation" : "\n            <p>Returns a description of the cluster operation specified by the ARN.</p>\n         "
     },
     "DescribeConfiguration" : {
       "name" : "DescribeConfiguration",
@@ -160,28 +192,28 @@
       },
       "output" : {
         "shape" : "DescribeConfigurationResponse",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       }, {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>"
+        "documentation" : "\n            <p>503 response</p>\n         "
       } ],
-      "documentation" : "<p>Returns a description of this MSK configuration.</p>"
+      "documentation" : "\n            <p>Returns a description of this MSK configuration.</p>\n         "
     },
     "DescribeConfigurationRevision" : {
       "name" : "DescribeConfigurationRevision",
@@ -195,28 +227,28 @@
       },
       "output" : {
         "shape" : "DescribeConfigurationRevisionResponse",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       }, {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>"
+        "documentation" : "\n            <p>503 response</p>\n         "
       } ],
-      "documentation" : "<p>Returns a description of this revision of the configuration.</p>"
+      "documentation" : "\n            <p>Returns a description of this revision of the configuration.</p>\n         "
     },
     "GetBootstrapBrokers" : {
       "name" : "GetBootstrapBrokers",
@@ -230,25 +262,54 @@
       },
       "output" : {
         "shape" : "GetBootstrapBrokersResponse",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ConflictException",
-        "documentation" : "<p>This cluster name already exists. Retry your request using another name.</p>"
+        "documentation" : "\n            <p>This cluster name already exists. Retry your request using another name.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       } ],
-      "documentation" : "<p>A list of brokers that a client application can use to bootstrap.</p>"
+      "documentation" : "\n            <p>A list of brokers that a client application can use to bootstrap.</p>\n         "
+    },
+    "ListClusterOperations" : {
+      "name" : "ListClusterOperations",
+      "http" : {
+        "method" : "GET",
+        "requestUri" : "/v1/clusters/{clusterArn}/operations",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "ListClusterOperationsRequest"
+      },
+      "output" : {
+        "shape" : "ListClusterOperationsResponse",
+        "documentation" : "\n            <p>Successful response.</p>\n         "
+      },
+      "errors" : [ {
+        "shape" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
+      }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+      } ],
+      "documentation" : "\n            <p>Returns a list of all the operations that have been performed on the specified MSK cluster.</p>\n         "
     },
     "ListClusters" : {
       "name" : "ListClusters",
@@ -262,22 +323,57 @@
       },
       "output" : {
         "shape" : "ListClustersResponse",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+      } ],
+      "documentation" : "\n            <p>Returns a list of all the MSK clusters in the current Region.</p>\n         "
+    },
+    "ListConfigurationRevisions" : {
+      "name" : "ListConfigurationRevisions",
+      "http" : {
+        "method" : "GET",
+        "requestUri" : "/v1/configurations/{arn}/revisions",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "ListConfigurationRevisionsRequest"
+      },
+      "output" : {
+        "shape" : "ListConfigurationRevisionsResponse",
+        "documentation" : "\n            <p>200 response</p>\n         "
+      },
+      "errors" : [ {
+        "shape" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
+      }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+      }, {
+        "shape" : "NotFoundException",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
+      }, {
+        "shape" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>503 response</p>\n         "
       } ],
-      "documentation" : "<p>Returns a list of clusters in an account.</p>"
+      "documentation" : "\n            <p>Returns a list of all the MSK configurations in this Region.</p>\n         "
     },
     "ListConfigurations" : {
       "name" : "ListConfigurations",
@@ -291,25 +387,25 @@
       },
       "output" : {
         "shape" : "ListConfigurationsResponse",
-        "documentation" : "<p>200 response</p>"
+        "documentation" : "\n            <p>200 response</p>\n         "
       },
       "errors" : [ {
         "shape" : "ServiceUnavailableException",
-        "documentation" : "<p>503 response</p>"
+        "documentation" : "\n            <p>503 response</p>\n         "
       }, {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Because of incorrect input, the request isn't valid. Correct the input, then retry the request.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "UnauthorizedException",
-        "documentation" : "<p>The request is not authorized. The provided credentials couldn't be validated.</p>"
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       } ],
-      "documentation" : "<p>Returns a list of all the MSK configurations in this Region for this account.</p>"
+      "documentation" : "\n            <p>Returns a list of all the MSK configurations in this Region.</p>\n         "
     },
     "ListNodes" : {
       "name" : "ListNodes",
@@ -323,22 +419,22 @@
       },
       "output" : {
         "shape" : "ListNodesResponse",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Successful response.</p>\n         "
       },
       "errors" : [ {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       }, {
         "shape" : "ForbiddenException",
-        "documentation" : "<p>Access forbidden. Check your credentials and then retry your request.</p>"
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
       } ],
-      "documentation" : "<p>Returns a list of the broker nodes in the cluster.</p>"
+      "documentation" : "\n            <p>Returns a list of the broker nodes in the cluster.</p>\n         "
     },
     "ListTagsForResource" : {
       "name" : "ListTagsForResource",
@@ -352,19 +448,19 @@
       },
       "output" : {
         "shape" : "ListTagsForResourceResponse",
-        "documentation" : "<p>Successful response.</p>"
+        "documentation" : "\n            <p>Success response.</p>\n         "
       },
       "errors" : [ {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       } ],
-      "documentation" : "<p>Returns a list of tags attached to a resource.</p>"
+      "documentation" : "\n            <p>Returns a list of the tags associated with the specified resource.</p>\n         "
     },
     "TagResource" : {
       "name" : "TagResource",
@@ -378,15 +474,15 @@
       },
       "errors" : [ {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
       }, {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
       } ],
-      "documentation" : "<p>Tag a resource with given tags.</p>"
+      "documentation" : "\n            <p>Adds tags to the specified MSK resource.</p>\n         "
     },
     "UntagResource" : {
       "name" : "UntagResource",
@@ -400,15 +496,82 @@
       },
       "errors" : [ {
         "shape" : "NotFoundException",
-        "documentation" : "<p>The resource could not be found due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
       }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      } ],
+      "documentation" : "\n            <p>Removes the tags associated with the keys that are provided in the query.</p>\n         "
+    },
+    "UpdateBrokerStorage" : {
+      "name" : "UpdateBrokerStorage",
+      "http" : {
+        "method" : "PUT",
+        "requestUri" : "/v1/clusters/{clusterArn}/nodes/storage",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "UpdateBrokerStorageRequest"
+      },
+      "output" : {
+        "shape" : "UpdateBrokerStorageResponse",
+        "documentation" : "\n            <p>Successful response.</p>\n         "
+      },
+      "errors" : [ {
+        "shape" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>503 response</p>\n         "
+      }, {
+        "shape" : "BadRequestException",
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
+      }, {
+        "shape" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
+      }, {
+        "shape" : "InternalServerErrorException",
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+      } ],
+      "documentation" : "\n            <p>Updates the EBS storage associated with MSK brokers.</p>\n         "
+    },
+    "UpdateClusterConfiguration" : {
+      "name" : "UpdateClusterConfiguration",
+      "http" : {
+        "method" : "PUT",
+        "requestUri" : "/v1/clusters/{clusterArn}/configuration",
+        "responseCode" : 200
+      },
+      "input" : {
+        "shape" : "UpdateClusterConfigurationRequest"
+      },
+      "output" : {
+        "shape" : "UpdateClusterConfigurationResponse",
+        "documentation" : "\n            <p>Successful response.</p>\n         "
+      },
+      "errors" : [ {
         "shape" : "BadRequestException",
-        "documentation" : "<p>Bad request due to incorrect input. Correct your request and then retry it.</p>"
+        "documentation" : "\n            <p>The request isn't valid because the input is incorrect. Correct your input and then submit it again.</p>\n         "
+      }, {
+        "shape" : "UnauthorizedException",
+        "documentation" : "\n            <p>The request is not authorized. The provided credentials couldn't be validated.</p>\n         "
       }, {
         "shape" : "InternalServerErrorException",
-        "documentation" : "<p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>"
+        "documentation" : "\n            <p>There was an unexpected internal server error. Retrying your request might resolve the issue.</p>\n         "
+      }, {
+        "shape" : "ForbiddenException",
+        "documentation" : "\n            <p>Access forbidden. Check your credentials and then retry your request.</p>\n         "
+      }, {
+        "shape" : "NotFoundException",
+        "documentation" : "\n            <p>The resource could not be found due to incorrect input. Correct the input, then retry the request.</p>\n         "
+      }, {
+        "shape" : "ServiceUnavailableException",
+        "documentation" : "\n            <p>503 response</p>\n         "
       } ],
-      "documentation" : "<p>Remove tags of a resource by given tag keys.</p>"
+      "documentation" : "\n            <p>Updates the cluster with the configuration that is specified in the request body.</p>\n         "
     }
   },
   "shapes" : {
@@ -418,15 +581,15 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 400
@@ -434,39 +597,56 @@
     },
     "BrokerAZDistribution" : {
       "type" : "string",
-      "documentation" : "<p>The distribution of broker nodes across Availability Zones. By default, broker nodes are distributed among three Availability Zones. Currently, the only supported value is DEFAULT. You can either specify this value explicitly or leave it out.</p>",
+      "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones. By default, broker nodes are distributed among three Availability Zones. Currently, the only supported value is DEFAULT. You can either specify this value explicitly or leave it out.</p>\n         ",
       "enum" : [ "DEFAULT" ]
     },
+    "BrokerEBSVolumeInfo" : {
+      "type" : "structure",
+      "members" : {
+        "KafkaBrokerNodeId" : {
+          "shape" : "__string",
+          "locationName" : "kafkaBrokerNodeId",
+          "documentation" : "\n            <p>The ID of the broker to update.</p>\n         "
+        },
+        "VolumeSizeGB" : {
+          "shape" : "__integer",
+          "locationName" : "volumeSizeGB",
+          "documentation" : "\n            <p>Size of the EBS volume to update.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Specifies the EBS volume upgrade information. The broker identifier must be set to the keyword ALL. This means the changes apply to all the brokers in the cluster.</p>\n         ",
+      "required" : [ "VolumeSizeGB", "KafkaBrokerNodeId" ]
+    },
     "BrokerNodeGroupInfo" : {
       "type" : "structure",
       "members" : {
         "BrokerAZDistribution" : {
           "shape" : "BrokerAZDistribution",
           "locationName" : "brokerAZDistribution",
-          "documentation" : "<p>The distribution of broker nodes across Availability Zones.</p>"
+          "documentation" : "\n            <p>The distribution of broker nodes across Availability Zones.</p>\n         "
         },
         "ClientSubnets" : {
           "shape" : "__listOf__string",
           "locationName" : "clientSubnets",
-          "documentation" : "<p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>"
+          "documentation" : "\n            <p>The list of subnets to connect to in the client virtual private cloud (VPC). AWS creates elastic network interfaces inside these subnets. Client applications use elastic network interfaces to produce and consume data. Client subnets can't be in Availability Zone us-east-1e.</p>\n         "
         },
         "InstanceType" : {
           "shape" : "__stringMin5Max32",
           "locationName" : "instanceType",
-          "documentation" : "<p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>"
+          "documentation" : "\n            <p>The type of Amazon EC2 instances to use for Kafka brokers. The following instance types are allowed: kafka.m5.large, kafka.m5.xlarge, kafka.m5.2xlarge,\nkafka.m5.4xlarge, kafka.m5.12xlarge, and kafka.m5.24xlarge.</p>\n         "
         },
         "SecurityGroups" : {
           "shape" : "__listOf__string",
           "locationName" : "securityGroups",
-          "documentation" : "<p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster.</p>"
+          "documentation" : "\n            <p>The AWS security groups to associate with the elastic network interfaces in order to specify who can connect to and communicate with the Amazon MSK cluster. If you don't specify a security group, Amazon MSK uses the default security group associated with the VPC.</p>\n         "
         },
         "StorageInfo" : {
           "shape" : "StorageInfo",
           "locationName" : "storageInfo",
-          "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>"
+          "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         "
         }
       },
-      "documentation" : "<p>Describes the setup to be used for Kafka broker nodes in the cluster.</p>",
+      "documentation" : "\n            <p>Describes the setup to be used for Kafka broker nodes in the cluster.</p>\n         ",
       "required" : [ "ClientSubnets", "InstanceType" ]
     },
     "BrokerNodeInfo" : {
@@ -475,30 +655,35 @@
         "AttachedENIId" : {
           "shape" : "__string",
           "locationName" : "attachedENIId",
-          "documentation" : "<p>The attached elastic network interface of the broker.</p>"
+          "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         "
         },
         "BrokerId" : {
           "shape" : "__double",
           "locationName" : "brokerId",
-          "documentation" : "<p>The ID of the broker.</p>"
+          "documentation" : "\n            <p>The ID of the broker.</p>\n         "
         },
         "ClientSubnet" : {
           "shape" : "__string",
           "locationName" : "clientSubnet",
-          "documentation" : "<p>The client subnet to which this broker node belongs.</p>"
+          "documentation" : "\n            <p>The client subnet to which this broker node belongs.</p>\n         "
         },
         "ClientVpcIpAddress" : {
           "shape" : "__string",
           "locationName" : "clientVpcIpAddress",
-          "documentation" : "<p>The virtual private cloud (VPC) of the client.</p>"
+          "documentation" : "\n            <p>The virtual private cloud (VPC) of the client.</p>\n         "
         },
         "CurrentBrokerSoftwareInfo" : {
           "shape" : "BrokerSoftwareInfo",
           "locationName" : "currentBrokerSoftwareInfo",
-          "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>"
+          "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         "
+        },
+        "Endpoints" : {
+          "shape" : "__listOf__string",
+          "locationName" : "endpoints",
+          "documentation" : "\n            <p>Endpoints for accessing the broker.</p>\n         "
         }
       },
-      "documentation" : "<p>BrokerNodeInfo</p>"
+      "documentation" : "\n            <p>BrokerNodeInfo</p>\n         "
     },
     "BrokerSoftwareInfo" : {
       "type" : "structure",
@@ -506,86 +691,173 @@
         "ConfigurationArn" : {
           "shape" : "__string",
           "locationName" : "configurationArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration used for the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration used for the cluster. This field isn't visible in this preview release.</p>\n         "
         },
         "ConfigurationRevision" : {
           "shape" : "__long",
           "locationName" : "configurationRevision",
-          "documentation" : "<p>The revision of the configuration to use.</p>"
+          "documentation" : "\n            <p>The revision of the configuration to use. This field isn't visible in this preview release.</p>\n         "
         },
         "KafkaVersion" : {
           "shape" : "__string",
           "locationName" : "kafkaVersion",
-          "documentation" : "<p>The version of Apache Kafka.</p>"
+          "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Information about the current software installed on the cluster.</p>\n         "
+    },
+    "ClientAuthentication" : {
+      "type" : "structure",
+      "members" : {
+        "Tls" : {
+          "shape" : "Tls",
+          "locationName" : "tls",
+          "documentation" : "\n            <p>Details for ClientAuthentication using TLS.</p>\n         "
         }
       },
-      "documentation" : "<p>Information about the current software installed on the cluster.</p>"
+      "documentation" : "\n            <p>Includes all client authentication information.</p>\n         "
+    },
+    "ClientBroker" : {
+      "type" : "string",
+      "documentation" : "\n            <p>Client-broker encryption in transit setting.</p>\n         ",
+      "enum" : [ "TLS", "TLS_PLAINTEXT", "PLAINTEXT" ]
     },
     "ClusterInfo" : {
       "type" : "structure",
       "members" : {
+        "ActiveOperationArn" : {
+          "shape" : "__string",
+          "locationName" : "activeOperationArn",
+          "documentation" : "\n            <p>Arn of active cluster operation.</p>\n         "
+        },
         "BrokerNodeGroupInfo" : {
           "shape" : "BrokerNodeGroupInfo",
           "locationName" : "brokerNodeGroupInfo",
-          "documentation" : "<p>Information about the broker nodes.</p>"
+          "documentation" : "\n            <p>Information about the broker nodes.</p>\n         "
+        },
+        "ClientAuthentication" : {
+          "shape" : "ClientAuthentication",
+          "locationName" : "clientAuthentication",
+          "documentation" : "\n            <p>Includes all client authentication information.</p>\n         "
         },
         "ClusterArn" : {
           "shape" : "__string",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
         },
         "ClusterName" : {
           "shape" : "__string",
           "locationName" : "clusterName",
-          "documentation" : "<p>The name of the cluster.</p>"
+          "documentation" : "\n            <p>The name of the cluster.</p>\n         "
         },
         "CreationTime" : {
           "shape" : "__timestampIso8601",
           "locationName" : "creationTime",
-          "documentation" : "<p>The time when the cluster was created.</p>"
+          "documentation" : "\n            <p>The time when the cluster was created.</p>\n         "
         },
         "CurrentBrokerSoftwareInfo" : {
           "shape" : "BrokerSoftwareInfo",
           "locationName" : "currentBrokerSoftwareInfo",
-          "documentation" : "<p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>"
+          "documentation" : "\n            <p>Information about the version of software currently deployed on the Kafka brokers in the cluster.</p>\n         "
         },
         "CurrentVersion" : {
           "shape" : "__string",
           "locationName" : "currentVersion",
-          "documentation" : "<p>The current version of the MSK cluster.</p>"
+          "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         "
         },
         "EncryptionInfo" : {
           "shape" : "EncryptionInfo",
           "locationName" : "encryptionInfo",
-          "documentation" : "<p>Includes all encryption-related information.</p>"
+          "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         "
         },
         "EnhancedMonitoring" : {
           "shape" : "EnhancedMonitoring",
           "locationName" : "enhancedMonitoring",
-          "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>"
+          "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         "
         },
         "NumberOfBrokerNodes" : {
           "shape" : "__integer",
           "locationName" : "numberOfBrokerNodes",
-          "documentation" : "<p>The number of Kafka broker nodes in the cluster.</p>"
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         "
         },
         "State" : {
           "shape" : "ClusterState",
           "locationName" : "state",
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>"
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         "
+        },
+        "Tags" : {
+          "shape" : "__mapOf__string",
+          "locationName" : "tags",
+          "documentation" : "\n            <p>Tags attached to the cluster.</p>\n         "
         },
         "ZookeeperConnectString" : {
           "shape" : "__string",
           "locationName" : "zookeeperConnectString",
-          "documentation" : "<p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>"
+          "documentation" : "\n            <p>The connection string to use to connect to the Apache ZooKeeper cluster.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about a cluster.</p>"
+      "documentation" : "\n            <p>Returns information about a cluster.</p>\n         "
+    },
+    "ClusterOperationInfo" : {
+      "type" : "structure",
+      "members" : {
+        "ClientRequestId" : {
+          "shape" : "__string",
+          "locationName" : "clientRequestId",
+          "documentation" : "\n            <p>The ID of the API request that triggered this operation.</p>\n         "
+        },
+        "ClusterArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>ARN of the cluster.</p>\n         "
+        },
+        "CreationTime" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "creationTime",
+          "documentation" : "\n            <p>The time that the operation was created.</p>\n         "
+        },
+        "EndTime" : {
+          "shape" : "__timestampIso8601",
+          "locationName" : "endTime",
+          "documentation" : "\n            <p>The time at which the operation finished.</p>\n         "
+        },
+        "ErrorInfo" : {
+          "shape" : "ErrorInfo",
+          "locationName" : "errorInfo",
+          "documentation" : "\n            <p>Describes the error if the operation fails.</p>\n         "
+        },
+        "OperationArn" : {
+          "shape" : "__string",
+          "locationName" : "operationArn",
+          "documentation" : "\n            <p>ARN of the cluster operation.</p>\n         "
+        },
+        "OperationState" : {
+          "shape" : "__string",
+          "locationName" : "operationState",
+          "documentation" : "\n            <p>State of the cluster operation.</p>\n         "
+        },
+        "OperationType" : {
+          "shape" : "__string",
+          "locationName" : "operationType",
+          "documentation" : "\n            <p>Type of the cluster operation.</p>\n         "
+        },
+        "SourceClusterInfo" : {
+          "shape" : "MutableClusterInfo",
+          "locationName" : "sourceClusterInfo",
+          "documentation" : "\n            <p>Information about cluster attributes before a cluster is updated.</p>\n         "
+        },
+        "TargetClusterInfo" : {
+          "shape" : "MutableClusterInfo",
+          "locationName" : "targetClusterInfo",
+          "documentation" : "\n            <p>Information about cluster attributes after a cluster is updated.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Returns information about a cluster operation.</p>\n         "
     },
     "ClusterState" : {
       "type" : "string",
-      "documentation" : "<p>The state of a Kafka cluster.</p>",
-      "enum" : [ "ACTIVE", "CREATING", "DELETING", "FAILED" ]
+      "documentation" : "\n            <p>The state of a Kafka cluster.</p>\n         ",
+      "enum" : [ "ACTIVE", "CREATING", "UPDATING", "DELETING", "FAILED" ]
     },
     "Configuration" : {
       "type" : "structure",
@@ -593,35 +865,35 @@
         "Arn" : {
           "shape" : "__string",
           "locationName" : "arn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         "
         },
         "CreationTime" : {
           "shape" : "__timestampIso8601",
           "locationName" : "creationTime",
-          "documentation" : "<p>The time when the configuration was created.</p>"
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         "
         },
         "Description" : {
           "shape" : "__string",
           "locationName" : "description",
-          "documentation" : "<p>The description of the configuration.</p>"
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         "
         },
         "KafkaVersions" : {
           "shape" : "__listOf__string",
           "locationName" : "kafkaVersions",
-          "documentation" : "<p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>"
+          "documentation" : "\n            <p>An array of the versions of Apache Kafka with which you can use this MSK configuration. You can use this configuration for an MSK cluster only if the Apache Kafka version specified for the cluster appears in this array.</p>\n         "
         },
         "LatestRevision" : {
           "shape" : "ConfigurationRevision",
           "locationName" : "latestRevision",
-          "documentation" : "<p>Latest revision of the configuration.</p>"
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         "
         },
         "Name" : {
           "shape" : "__string",
           "locationName" : "name",
-          "documentation" : "<p>The name of the configuration.</p>"
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         "
         }
       },
-      "documentation" : "<p>Represents an MSK Configuration.</p>",
+      "documentation" : "\n            <p>Represents an MSK Configuration.</p>\n         ",
       "required" : [ "Description", "LatestRevision", "CreationTime", "KafkaVersions", "Arn", "Name" ]
     },
     "ConfigurationInfo" : {
@@ -630,15 +902,15 @@
         "Arn" : {
           "shape" : "__string",
           "locationName" : "arn",
-          "documentation" : "<p>ARN of the configuration to use.</p>"
+          "documentation" : "\n            <p>ARN of the configuration to use.</p>\n         "
         },
         "Revision" : {
           "shape" : "__long",
           "locationName" : "revision",
-          "documentation" : "<p>The revision of the configuration to use.</p>"
+          "documentation" : "\n            <p>The revision of the configuration to use.</p>\n         "
         }
       },
-      "documentation" : "<p>Specifies the Kafka configuration to use for the brokers.</p>",
+      "documentation" : "\n            <p>Specifies the configuration to use for the brokers.</p>\n         ",
       "required" : [ "Revision", "Arn" ]
     },
     "ConfigurationRevision" : {
@@ -647,20 +919,20 @@
         "CreationTime" : {
           "shape" : "__timestampIso8601",
           "locationName" : "creationTime",
-          "documentation" : "<p>The time when the configuration revision was created.</p>"
+          "documentation" : "\n            <p>The time when the configuration revision was created.</p>\n         "
         },
         "Description" : {
           "shape" : "__string",
           "locationName" : "description",
-          "documentation" : "<p>The description of the configuration revision.</p>"
+          "documentation" : "\n            <p>The description of the configuration revision.</p>\n         "
         },
         "Revision" : {
           "shape" : "__long",
           "locationName" : "revision",
-          "documentation" : "<p>The revision number.</p>"
+          "documentation" : "\n            <p>The revision number.</p>\n         "
         }
       },
-      "documentation" : "<p>Describes a configuration revision.</p>",
+      "documentation" : "\n            <p>Describes a configuration revision.</p>\n         ",
       "required" : [ "Revision", "CreationTime" ]
     },
     "ConflictException" : {
@@ -669,15 +941,15 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 409
@@ -689,37 +961,47 @@
         "BrokerNodeGroupInfo" : {
           "shape" : "BrokerNodeGroupInfo",
           "locationName" : "brokerNodeGroupInfo",
-          "documentation" : "<p>Information about the broker nodes in the cluster.</p>"
+          "documentation" : "\n            <p>Information about the broker nodes in the cluster.</p>\n         "
+        },
+        "ClientAuthentication" : {
+          "shape" : "ClientAuthentication",
+          "locationName" : "clientAuthentication",
+          "documentation" : "\n            <p>Includes all client authentication related information.</p>\n         "
         },
         "ClusterName" : {
           "shape" : "__stringMin1Max64",
           "locationName" : "clusterName",
-          "documentation" : "<p>The name of the cluster.</p>"
+          "documentation" : "\n            <p>The name of the cluster.</p>\n         "
         },
         "ConfigurationInfo" : {
           "shape" : "ConfigurationInfo",
           "locationName" : "configurationInfo",
-          "documentation" : "<p>Comprises of the Configuration to be used on Kafka brokers in a cluster.</p>"
+          "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         "
         },
         "EncryptionInfo" : {
           "shape" : "EncryptionInfo",
           "locationName" : "encryptionInfo",
-          "documentation" : "<p>Includes all encryption-related information.</p>"
+          "documentation" : "\n            <p>Includes all encryption-related information.</p>\n         "
         },
         "EnhancedMonitoring" : {
           "shape" : "EnhancedMonitoring",
           "locationName" : "enhancedMonitoring",
-          "documentation" : "<p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>"
+          "documentation" : "\n            <p>Specifies the level of monitoring for the MSK cluster. The possible values are DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>\n         "
         },
         "KafkaVersion" : {
           "shape" : "__stringMin1Max128",
           "locationName" : "kafkaVersion",
-          "documentation" : "<p>The version of Apache Kafka.</p>"
+          "documentation" : "\n            <p>The version of Apache Kafka.</p>\n         "
         },
         "NumberOfBrokerNodes" : {
           "shape" : "__integerMin1Max15",
           "locationName" : "numberOfBrokerNodes",
-          "documentation" : "<p>The number of Kafka broker nodes in the Amazon MSK cluster.</p>"
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         "
+        },
+        "Tags" : {
+          "shape" : "__mapOf__string",
+          "locationName" : "tags",
+          "documentation" : "\n            <p>Create tags when creating the cluster.</p>\n         "
         }
       },
       "required" : [ "BrokerNodeGroupInfo", "KafkaVersion", "NumberOfBrokerNodes", "ClusterName" ]
@@ -730,17 +1012,17 @@
         "ClusterArn" : {
           "shape" : "__string",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         "
         },
         "ClusterName" : {
           "shape" : "__string",
           "locationName" : "clusterName",
-          "documentation" : "<p>The name of the MSK cluster.</p>"
+          "documentation" : "\n            <p>The name of the MSK cluster.</p>\n         "
         },
         "State" : {
           "shape" : "ClusterState",
           "locationName" : "state",
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>"
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         "
         }
       }
     },
@@ -750,22 +1032,22 @@
         "Description" : {
           "shape" : "__string",
           "locationName" : "description",
-          "documentation" : "<p>The description of the configuration.</p>"
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         "
         },
         "KafkaVersions" : {
           "shape" : "__listOf__string",
           "locationName" : "kafkaVersions",
-          "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>"
+          "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         "
         },
         "Name" : {
           "shape" : "__string",
           "locationName" : "name",
-          "documentation" : "<p>The name of the configuration.</p>"
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         "
         },
         "ServerProperties" : {
           "shape" : "__blob",
           "locationName" : "serverProperties",
-          "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>"
+          "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         "
         }
       },
       "required" : [ "ServerProperties", "KafkaVersions", "Name" ]
@@ -776,22 +1058,22 @@
         "Arn" : {
           "shape" : "__string",
           "locationName" : "arn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         "
         },
         "CreationTime" : {
           "shape" : "__timestampIso8601",
           "locationName" : "creationTime",
-          "documentation" : "<p>The time when the configuration was created.</p>"
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         "
         },
         "LatestRevision" : {
           "shape" : "ConfigurationRevision",
           "locationName" : "latestRevision",
-          "documentation" : "<p>Latest revision of the configuration.</p>"
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         "
         },
         "Name" : {
           "shape" : "__string",
           "locationName" : "name",
-          "documentation" : "<p>The name of the configuration.</p>"
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         "
         }
       }
     },
@@ -802,13 +1084,13 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
         },
         "CurrentVersion" : {
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "currentVersion",
-          "documentation" : "<p>The current version of the MSK cluster.</p>"
+          "documentation" : "\n            <p>The current version of the MSK cluster.</p>\n         "
         }
       },
       "required" : [ "ClusterArn" ]
@@ -819,12 +1101,34 @@
         "ClusterArn" : {
           "shape" : "__string",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         "
         },
         "State" : {
           "shape" : "ClusterState",
           "locationName" : "state",
-          "documentation" : "<p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>"
+          "documentation" : "\n            <p>The state of the cluster. The possible states are CREATING, ACTIVE, and FAILED.</p>\n         "
+        }
+      }
+    },
+    "DescribeClusterOperationRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterOperationArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "clusterOperationArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the MSK cluster operation.</p>\n         "
+        }
+      },
+      "required" : [ "ClusterOperationArn" ]
+    },
+    "DescribeClusterOperationResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterOperationInfo" : {
+          "shape" : "ClusterOperationInfo",
+          "locationName" : "clusterOperationInfo",
+          "documentation" : "\n            <p>Cluster operation information</p>\n         "
         }
       }
     },
@@ -835,7 +1139,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
         }
       },
       "required" : [ "ClusterArn" ]
@@ -846,7 +1150,7 @@
         "ClusterInfo" : {
           "shape" : "ClusterInfo",
           "locationName" : "clusterInfo",
-          "documentation" : "<p>The cluster information.</p>"
+          "documentation" : "\n            <p>The cluster information.</p>\n         "
         }
       }
     },
@@ -857,7 +1161,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "arn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         "
         }
       },
       "required" : [ "Arn" ]
@@ -868,32 +1172,32 @@
         "Arn" : {
           "shape" : "__string",
           "locationName" : "arn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         "
         },
         "CreationTime" : {
           "shape" : "__timestampIso8601",
           "locationName" : "creationTime",
-          "documentation" : "<p>The time when the configuration was created.</p>"
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         "
         },
         "Description" : {
           "shape" : "__string",
           "locationName" : "description",
-          "documentation" : "<p>The description of the configuration.</p>"
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         "
         },
         "KafkaVersions" : {
           "shape" : "__listOf__string",
           "locationName" : "kafkaVersions",
-          "documentation" : "<p>The versions of Apache Kafka with which you can use this MSK configuration.</p>"
+          "documentation" : "\n            <p>The versions of Apache Kafka with which you can use this MSK configuration.</p>\n         "
         },
         "LatestRevision" : {
           "shape" : "ConfigurationRevision",
           "locationName" : "latestRevision",
-          "documentation" : "<p>Latest revision of the configuration.</p>"
+          "documentation" : "\n            <p>Latest revision of the configuration.</p>\n         "
         },
         "Name" : {
           "shape" : "__string",
           "locationName" : "name",
-          "documentation" : "<p>The name of the configuration.</p>"
+          "documentation" : "\n            <p>The name of the configuration.</p>\n         "
         }
       }
     },
@@ -904,13 +1208,13 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "arn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         "
         },
         "Revision" : {
           "shape" : "__long",
           "location" : "uri",
           "locationName" : "revision",
-          "documentation" : "<p>A string that uniquely identifies a revision of an MSK configuration.</p>"
+          "documentation" : "\n            <p>A string that uniquely identifies a revision of an MSK configuration.</p>\n         "
         }
       },
       "required" : [ "Revision", "Arn" ]
@@ -921,27 +1225,27 @@
         "Arn" : {
           "shape" : "__string",
           "locationName" : "arn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the configuration.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the configuration.</p>\n         "
         },
         "CreationTime" : {
           "shape" : "__timestampIso8601",
           "locationName" : "creationTime",
-          "documentation" : "<p>The time when the configuration was created.</p>"
+          "documentation" : "\n            <p>The time when the configuration was created.</p>\n         "
         },
         "Description" : {
           "shape" : "__string",
           "locationName" : "description",
-          "documentation" : "<p>The description of the configuration.</p>"
+          "documentation" : "\n            <p>The description of the configuration.</p>\n         "
         },
         "Revision" : {
           "shape" : "__long",
           "locationName" : "revision",
-          "documentation" : "<p>The revision number.</p>"
+          "documentation" : "\n            <p>The revision number.</p>\n         "
         },
         "ServerProperties" : {
           "shape" : "__blob",
           "locationName" : "serverProperties",
-          "documentation" : "<p>Contents of the server.properties file. When using the API, you must ensure that the contents of the file are base64 encoded. \n When using the AWS Management Console, the SDK, or the AWS CLI, the contents of server.properties can be in plaintext.</p>"
+          "documentation" : "\n            <p>Contents of the <filename>server.properties</filename> file. When using the API, you must ensure that the contents of the file are base64 encoded. \n               When using the AWS Management Console, the SDK, or the AWS CLI, the contents of <filename>server.properties</filename> can be in plaintext.</p>\n         "
         }
       }
     },
@@ -951,10 +1255,10 @@
         "VolumeSize" : {
           "shape" : "__integerMin1Max16384",
           "locationName" : "volumeSize",
-          "documentation" : "<p>The size in GiB of the EBS volume for the data drive on each broker node.</p>"
+          "documentation" : "\n            <p>The size in GiB of the EBS volume for the data drive on each broker node.</p>\n         "
         }
       },
-      "documentation" : "<p>Contains information about the EBS storage volumes attached to Kafka broker nodes.</p>"
+      "documentation" : "\n            <p>Contains information about the EBS storage volumes attached to Kafka broker nodes.</p>\n         "
     },
     "EncryptionAtRest" : {
       "type" : "structure",
@@ -962,26 +1266,47 @@
         "DataVolumeKMSKeyId" : {
           "shape" : "__string",
           "locationName" : "dataVolumeKMSKeyId",
-          "documentation" : "<p>The AWS KMS key used for data encryption.</p>"
+          "documentation" : "\n            <p>The ARN of the AWS KMS key for encrypting data at rest. If you don't specify a KMS key, MSK creates one for you and uses it.</p>\n         "
         }
       },
-      "documentation" : "<p>The data volume encryption details.</p>",
+      "documentation" : "\n            <p>The data-volume encryption details.</p>\n         ",
       "required" : [ "DataVolumeKMSKeyId" ]
     },
+    "EncryptionInTransit" : {
+      "type" : "structure",
+      "members" : {
+        "ClientBroker" : {
+          "shape" : "ClientBroker",
+          "locationName" : "clientBroker",
+          "documentation" : "\n            <p>Indicates the encryption setting for data in transit between clients and brokers. The following are the possible values.</p>\n            <p>\n               TLS means that client-broker communication is enabled with TLS only.</p>\n            <p>\n               TLS_PLAINTEXT means that client-broker communication is enabled for both TLS-encrypted, as well as plaintext data.</p>\n            <p>\n               PLAINTEXT means that client-broker communication is enabled in plaintext only.</p>\n            <p>The default value is TLS_PLAINTEXT.</p>\n         "
+        },
+        "InCluster" : {
+          "shape" : "__boolean",
+          "locationName" : "inCluster",
+          "documentation" : "\n            <p>When set to true, it indicates that data communication among the broker nodes of the cluster is encrypted. When set to false, the communication happens in plaintext.</p>\n            <p>The default value is true.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>The settings for encrypting data in transit.</p>\n         "
+    },
     "EncryptionInfo" : {
       "type" : "structure",
       "members" : {
         "EncryptionAtRest" : {
           "shape" : "EncryptionAtRest",
           "locationName" : "encryptionAtRest",
-          "documentation" : "<p>The data volume encryption details.</p>"
+          "documentation" : "\n            <p>The data-volume encryption details.</p>\n         "
+        },
+        "EncryptionInTransit" : {
+          "shape" : "EncryptionInTransit",
+          "locationName" : "encryptionInTransit",
+          "documentation" : "\n            <p>The details for encryption in transit.</p>\n         "
         }
       },
-      "documentation" : "<p>Includes encryption-related information, such as the AWS KMS key used for encrypting data at rest.</p>"
+      "documentation" : "\n            <p>Includes encryption-related information, such as the AWS KMS key used for encrypting data at rest and whether you want MSK to encrypt your data in transit.</p>\n         "
     },
     "EnhancedMonitoring" : {
       "type" : "string",
-      "documentation" : "<p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER.</p>",
+      "documentation" : "\n            <p>Specifies which metrics are gathered for the MSK cluster. This property has three possible values: DEFAULT, PER_BROKER, and PER_TOPIC_PER_BROKER. For a list of the metrics associated with each of these three levels of monitoring, see <a href=\"https://docs.aws.amazon.com/msk/latest/developerguide/monitoring.html\">Monitoring</a>.</p>\n         ",
       "enum" : [ "DEFAULT", "PER_BROKER", "PER_TOPIC_PER_BROKER" ]
     },
     "Error" : {
@@ -990,15 +1315,31 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>"
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         "
+    },
+    "ErrorInfo" : {
+      "type" : "structure",
+      "members" : {
+        "ErrorCode" : {
+          "shape" : "__string",
+          "locationName" : "errorCode",
+          "documentation" : "\n            <p>A number describing the error programmatically.</p>\n         "
+        },
+        "ErrorString" : {
+          "shape" : "__string",
+          "locationName" : "errorString",
+          "documentation" : "\n            <p>An optional field to provide more details about the error.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Returns information about an error state of the cluster.</p>\n         "
     },
     "ForbiddenException" : {
       "type" : "structure",
@@ -1006,15 +1347,15 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 403
@@ -1027,7 +1368,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
         }
       },
       "required" : [ "ClusterArn" ]
@@ -1038,7 +1379,12 @@
         "BootstrapBrokerString" : {
           "shape" : "__string",
           "locationName" : "bootstrapBrokerString",
-          "documentation" : "<p>A string containing one or more hostname:port pairs.</p>"
+          "documentation" : "\n            <p>A string containing one or more hostname:port pairs.</p>\n         "
+        },
+        "BootstrapBrokerStringTls" : {
+          "shape" : "__string",
+          "locationName" : "bootstrapBrokerStringTls",
+          "documentation" : "\n            <p>A string containing one or more DNS names (or IP) and TLS port pairs.</p>\n         "
         }
       }
     },
@@ -1048,20 +1394,59 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 500
       }
     },
+    "ListClusterOperationsRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
+        },
+        "MaxResults" : {
+          "shape" : "MaxResults",
+          "location" : "querystring",
+          "locationName" : "maxResults",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         "
+        },
+        "NextToken" : {
+          "shape" : "__string",
+          "location" : "querystring",
+          "locationName" : "nextToken",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         "
+        }
+      },
+      "required" : [ "ClusterArn" ]
+    },
+    "ListClusterOperationsResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterOperationInfoList" : {
+          "shape" : "__listOfClusterOperationInfo",
+          "locationName" : "clusterOperationInfoList",
+          "documentation" : "\n            <p>An array of cluster operation information objects.</p>\n         "
+        },
+        "NextToken" : {
+          "shape" : "__string",
+          "locationName" : "nextToken",
+          "documentation" : "\n            <p>If the response of ListClusterOperations is truncated, it returns a NextToken in the response. This Nexttoken should be sent in the subsequent request to ListClusterOperations.</p>\n         "
+        }
+      }
+    },
     "ListClustersRequest" : {
       "type" : "structure",
       "members" : {
@@ -1069,19 +1454,19 @@
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "clusterNameFilter",
-          "documentation" : "<p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>"
+          "documentation" : "\n            <p>Specify a prefix of the name of the clusters that you want to list. The service lists all the clusters whose names start with this prefix.</p>\n         "
         },
         "MaxResults" : {
           "shape" : "MaxResults",
           "location" : "querystring",
           "locationName" : "maxResults",
-          "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>"
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         "
         },
         "NextToken" : {
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>"
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         "
         }
       }
     },
@@ -1091,29 +1476,68 @@
         "ClusterInfoList" : {
           "shape" : "__listOfClusterInfo",
           "locationName" : "clusterInfoList",
-          "documentation" : "<p>Information on each of the MSK clusters in the response.</p>"
+          "documentation" : "\n            <p>Information on each of the MSK clusters in the response.</p>\n         "
         },
         "NextToken" : {
           "shape" : "__string",
           "locationName" : "nextToken",
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>"
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n               To get another batch of clusters, provide this token in your next request.</p>\n         "
         }
       }
     },
-    "ListConfigurationsRequest" : {
+    "ListConfigurationRevisionsRequest" : {
       "type" : "structure",
       "members" : {
+        "Arn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "arn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies an MSK configuration and all of its revisions.</p>\n         "
+        },
         "MaxResults" : {
+          "shape" : "MaxResults",
+          "location" : "querystring",
+          "locationName" : "maxResults",
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         "
+        },
+        "NextToken" : {
           "shape" : "__string",
           "location" : "querystring",
+          "locationName" : "nextToken",
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         "
+        }
+      },
+      "required" : [ "Arn" ]
+    },
+    "ListConfigurationRevisionsResponse" : {
+      "type" : "structure",
+      "members" : {
+        "NextToken" : {
+          "shape" : "__string",
+          "locationName" : "nextToken",
+          "documentation" : "\n            <p>Paginated results marker.</p>\n         "
+        },
+        "Revisions" : {
+          "shape" : "__listOfConfigurationRevision",
+          "locationName" : "revisions",
+          "documentation" : "\n            <p>List of ConfigurationRevision objects.</p>\n         "
+        }
+      }
+    },
+    "ListConfigurationsRequest" : {
+      "type" : "structure",
+      "members" : {
+        "MaxResults" : {
+          "shape" : "MaxResults",
+          "location" : "querystring",
           "locationName" : "maxResults",
-          "documentation" : "<p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>"
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         "
         },
         "NextToken" : {
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n To get the next batch, provide this token in your next request.</p>"
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         "
         }
       }
     },
@@ -1123,12 +1547,12 @@
         "Configurations" : {
           "shape" : "__listOfConfiguration",
           "locationName" : "configurations",
-          "documentation" : "<p>An array of MSK configurations.</p>"
+          "documentation" : "\n            <p>An array of MSK configurations.</p>\n         "
         },
         "NextToken" : {
           "shape" : "__string",
           "locationName" : "nextToken",
-          "documentation" : "<p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n To get another batch of configurations, provide this token in your next request.</p>"
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListConfigurations operation is truncated, the call returns NextToken in the response. \n               To get another batch of configurations, provide this token in your next request.</p>\n         "
         }
       }
     },
@@ -1139,19 +1563,19 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "clusterArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
         },
         "MaxResults" : {
           "shape" : "MaxResults",
           "location" : "querystring",
           "locationName" : "maxResults",
-          "documentation" : "<p>The maximum number of clusters to return in the response. If there are more clusters, the response includes a NextToken parameter.</p>"
+          "documentation" : "\n            <p>The maximum number of results to return in the response. If there are more results, the response includes a NextToken parameter.</p>\n         "
         },
         "NextToken" : {
           "shape" : "__string",
           "location" : "querystring",
           "locationName" : "nextToken",
-          "documentation" : "<p>The paginated results marker. When the result of a ListClusters operation is truncated, the call returns NextToken in the response. \n To get another batch of clusters, provide this token in your next request.</p>"
+          "documentation" : "\n            <p>The paginated results marker. When the result of the operation is truncated, the call returns NextToken in the response. \n            To get the next batch, provide this token in your next request.</p>\n         "
         }
       },
       "required" : [ "ClusterArn" ]
@@ -1162,12 +1586,12 @@
         "NextToken" : {
           "shape" : "__string",
           "locationName" : "nextToken",
-          "documentation" : "<p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n To get another batch of nodes, provide this token in your next request.</p>"
+          "documentation" : "\n            <p>The paginated results marker. When the result of a ListNodes operation is truncated, the call returns NextToken in the response. \n               To get another batch of nodes, provide this token in your next request.</p>\n         "
         },
         "NodeInfoList" : {
           "shape" : "__listOfNodeInfo",
           "locationName" : "nodeInfoList",
-          "documentation" : "<p>List containing a NodeInfo object.</p>"
+          "documentation" : "\n            <p>List containing a NodeInfo object.</p>\n         "
         }
       }
     },
@@ -1178,7 +1602,7 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "resourceArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         "
         }
       },
       "required" : [ "ResourceArn" ]
@@ -1189,7 +1613,7 @@
         "Tags" : {
           "shape" : "__mapOf__string",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value pairs for the resource tags</p>"
+          "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         "
         }
       }
     },
@@ -1198,45 +1622,66 @@
       "min" : 1,
       "max" : 100
     },
+    "MutableClusterInfo" : {
+      "type" : "structure",
+      "members" : {
+        "BrokerEBSVolumeInfo" : {
+          "shape" : "__listOfBrokerEBSVolumeInfo",
+          "locationName" : "brokerEBSVolumeInfo",
+          "documentation" : "\n            <p>Specifies the size of the EBS volume and the ID of the associated broker.</p>\n         "
+        },
+        "ConfigurationInfo" : {
+          "shape" : "ConfigurationInfo",
+          "locationName" : "configurationInfo",
+          "documentation" : "\n            <p>Information about the changes in the configuration of the brokers.</p>\n         "
+        },
+        "NumberOfBrokerNodes" : {
+          "shape" : "__integer",
+          "locationName" : "numberOfBrokerNodes",
+          "documentation" : "\n            <p>The number of broker nodes in the cluster.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Information about cluster attributes that can be updated via update APIs.</p>\n         "
+    },
     "NodeInfo" : {
       "type" : "structure",
       "members" : {
         "AddedToClusterTime" : {
           "shape" : "__string",
           "locationName" : "addedToClusterTime",
-          "documentation" : "<p>The start time.</p>"
+          "documentation" : "\n            <p>The start time.</p>\n         "
         },
         "BrokerNodeInfo" : {
           "shape" : "BrokerNodeInfo",
           "locationName" : "brokerNodeInfo",
-          "documentation" : "<p>The broker node info.</p>"
+          "documentation" : "\n            <p>The broker node info.</p>\n         "
         },
         "InstanceType" : {
           "shape" : "__string",
           "locationName" : "instanceType",
-          "documentation" : "<p>The instance type.</p>"
+          "documentation" : "\n            <p>The instance type.</p>\n         "
         },
         "NodeARN" : {
           "shape" : "__string",
           "locationName" : "nodeARN",
-          "documentation" : "<p>The Amazon Resource Name (ARN) of the node.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the node.</p>\n         "
         },
         "NodeType" : {
           "shape" : "NodeType",
           "locationName" : "nodeType",
-          "documentation" : "<p>The node type.</p>"
+          "documentation" : "\n            <p>The node type.</p>\n         "
         },
         "ZookeeperNodeInfo" : {
           "shape" : "ZookeeperNodeInfo",
           "locationName" : "zookeeperNodeInfo",
-          "documentation" : "<p>The ZookeeperNodeInfo.</p>"
+          "documentation" : "\n            <p>The ZookeeperNodeInfo.</p>\n         "
         }
       },
-      "documentation" : "<p>The node information object.</p>"
+      "documentation" : "\n            <p>The node information object.</p>\n         "
     },
     "NodeType" : {
       "type" : "string",
-      "documentation" : "<p>The broker or Zookeeper node.</p>",
+      "documentation" : "\n            <p>The broker or Zookeeper node.</p>\n         ",
       "enum" : [ "BROKER" ]
     },
     "NotFoundException" : {
@@ -1245,15 +1690,15 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 404
@@ -1265,15 +1710,15 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 503
@@ -1285,10 +1730,10 @@
         "EbsStorageInfo" : {
           "shape" : "EBSStorageInfo",
           "locationName" : "ebsStorageInfo",
-          "documentation" : "<p>EBS volume information.</p>"
+          "documentation" : "\n            <p>EBS volume information.</p>\n         "
         }
       },
-      "documentation" : "<p>Contains information about storage volumes attached to MSK broker nodes.</p>"
+      "documentation" : "\n            <p>Contains information about storage volumes attached to MSK broker nodes.</p>\n         "
     },
     "TagResourceRequest" : {
       "type" : "structure",
@@ -1297,31 +1742,42 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "resourceArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         "
         },
         "Tags" : {
           "shape" : "__mapOf__string",
           "locationName" : "tags",
-          "documentation" : "<p>The key-value pairs for the resource tags</p>"
+          "documentation" : "\n            <p>The key-value pair for the resource tag.</p>\n         "
         }
       },
       "required" : [ "ResourceArn", "Tags" ]
     },
+    "Tls" : {
+      "type" : "structure",
+      "members" : {
+        "CertificateAuthorityArnList" : {
+          "shape" : "__listOf__string",
+          "locationName" : "certificateAuthorityArnList",
+          "documentation" : "\n            <p>List of ACM Certificate Authority ARNs.</p>\n         "
+        }
+      },
+      "documentation" : "\n            <p>Details for client authentication using TLS.</p>\n         "
+    },
     "TooManyRequestsException" : {
       "type" : "structure",
       "members" : {
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 429
@@ -1333,15 +1789,15 @@
         "InvalidParameter" : {
           "shape" : "__string",
           "locationName" : "invalidParameter",
-          "documentation" : "<p>The parameter that caused the error.</p>"
+          "documentation" : "\n            <p>The parameter that caused the error.</p>\n         "
         },
         "Message" : {
           "shape" : "__string",
           "locationName" : "message",
-          "documentation" : "<p>The description of the error.</p>"
+          "documentation" : "\n            <p>The description of the error.</p>\n         "
         }
       },
-      "documentation" : "<p>Returns information about an error.</p>",
+      "documentation" : "\n            <p>Returns information about an error.</p>\n         ",
       "exception" : true,
       "error" : {
         "httpStatusCode" : 401
@@ -1354,42 +1810,121 @@
           "shape" : "__string",
           "location" : "uri",
           "locationName" : "resourceArn",
-          "documentation" : "<p>The Amazon Resource Name (ARN) that uniquely identifies the resource.</p>"
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the resource that's associated with the tags.</p>\n         "
         },
         "TagKeys" : {
           "shape" : "__listOf__string",
           "location" : "querystring",
           "locationName" : "tagKeys",
-          "documentation" : "<p>The list of tag keys.</p>"
+          "documentation" : "\n            <p>Tag keys must be unique for a given cluster. In addition, the following restrictions apply:</p>\n            <ul>\n               <li>\n                  <p>Each tag key must be unique. If you add a tag with a key that's already in\n                  use, your new tag overwrites the existing key-value pair. </p>\n               </li>\n               <li>\n                  <p>You can't start a tag key with aws: because this prefix is reserved for use\n                  by  AWS.  AWS creates tags that begin with this prefix on your behalf, but\n                  you can't edit or delete them.</p>\n               </li>\n               <li>\n                  <p>Tag keys must be between 1 and 128 Unicode characters in length.</p>\n               </li>\n               <li>\n                  <p>Tag keys must consist of the following characters: Unicode letters, digits,\n                  white space, and the following special characters: _ . / = + -\n                     @.</p>\n               </li>\n            </ul>\n         "
         }
-    },
+      },
       "required" : [ "TagKeys", "ResourceArn" ]
     },
+    "UpdateBrokerStorageRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
+        },
+        "CurrentVersion" : {
+          "shape" : "__string",
+          "locationName" : "currentVersion",
+          "documentation" : "\n            <p>The version of cluster to update from. A successful operation will then generate a new version.</p>\n         "
+        },
+        "TargetBrokerEBSVolumeInfo" : {
+          "shape" : "__listOfBrokerEBSVolumeInfo",
+          "locationName" : "targetBrokerEBSVolumeInfo",
+          "documentation" : "\n            <p>Describes the target volume size and the ID of the broker to apply the update to.</p>\n         "
+        }
+      },
+      "required" : [ "ClusterArn", "TargetBrokerEBSVolumeInfo", "CurrentVersion" ]
+    },
+    "UpdateBrokerStorageResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         "
+        },
+        "ClusterOperationArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterOperationArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         "
+        }
+      }
+    },
+    "UpdateClusterConfigurationRequest" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "location" : "uri",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) that uniquely identifies the cluster.</p>\n         "
+        },
+        "ConfigurationInfo" : {
+          "shape" : "ConfigurationInfo",
+          "locationName" : "configurationInfo",
+          "documentation" : "\n            <p>Represents the configuration that you want MSK to use for the brokers in a cluster.</p>\n         "
+        },
+        "CurrentVersion" : {
+          "shape" : "__string",
+          "locationName" : "currentVersion",
+          "documentation" : "\n            <p>The version of the cluster that needs to be updated.</p>\n         "
+        }
+      },
+      "required" : [ "ClusterArn", "CurrentVersion", "ConfigurationInfo" ]
+    },
+    "UpdateClusterConfigurationResponse" : {
+      "type" : "structure",
+      "members" : {
+        "ClusterArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster.</p>\n         "
+        },
+        "ClusterOperationArn" : {
+          "shape" : "__string",
+          "locationName" : "clusterOperationArn",
+          "documentation" : "\n            <p>The Amazon Resource Name (ARN) of the cluster operation.</p>\n         "
+        }
+      }
+    },
     "ZookeeperNodeInfo" : {
       "type" : "structure",
       "members" : {
         "AttachedENIId" : {
           "shape" : "__string",
           "locationName" : "attachedENIId",
-          "documentation" : "<p>The attached elastic network interface of the broker.</p>"
+          "documentation" : "\n            <p>The attached elastic network interface of the broker.</p>\n         "
         },
         "ClientVpcIpAddress" : {
           "shape" : "__string",
           "locationName" : "clientVpcIpAddress",
-          "documentation" : "<p>The virtual private cloud (VPC) IP address of the client.</p>"
+          "documentation" : "\n            <p>The virtual private cloud (VPC) IP address of the client.</p>\n         "
+        },
+        "Endpoints" : {
+          "shape" : "__listOf__string",
+          "locationName" : "endpoints",
+          "documentation" : "\n            <p>Endpoints for accessing the ZooKeeper.</p>\n         "
         },
         "ZookeeperId" : {
           "shape" : "__double",
           "locationName" : "zookeeperId",
-          "documentation" : "<p>The role-specific ID for Zookeeper.</p>"
+          "documentation" : "\n            <p>The role-specific ID for Zookeeper.</p>\n         "
         },
         "ZookeeperVersion" : {
           "shape" : "__string",
           "locationName" : "zookeeperVersion",
-          "documentation" : "<p>The version of Zookeeper.</p>"
+          "documentation" : "\n            <p>The version of Zookeeper.</p>\n         "
         }
       },
-      "documentation" : "<p>Zookeeper node information.</p>"
+      "documentation" : "\n            <p>Zookeeper node information.</p>\n         "
     },
     "__boolean" : {
       "type" : "boolean"
@@ -1413,18 +1948,36 @@
       "min" : 1,
       "max" : 16384
     },
+    "__listOfBrokerEBSVolumeInfo" : {
+      "type" : "list",
+      "member" : {
+        "shape" : "BrokerEBSVolumeInfo"
+      }
+    },
     "__listOfClusterInfo" : {
       "type" : "list",
       "member" : {
         "shape" : "ClusterInfo"
       }
     },
+    "__listOfClusterOperationInfo" : {
+      "type" : "list",
+      "member" : {
+        "shape" : "ClusterOperationInfo"
+      }
+    },
     "__listOfConfiguration" : {
       "type" : "list",
       "member" : {
         "shape" : "Configuration"
       }
     },
+    "__listOfConfigurationRevision" : {
+      "type" : "list",
+      "member" : {
+        "shape" : "ConfigurationRevision"
+      }
+    },
     "__listOfNodeInfo" : {
       "type" : "list",
       "member" : {
@@ -1476,5 +2029,5 @@
       "timestampFormat" : "unixTimestamp"
     }
   },
-  "documentation" : "<p>The operations for managing an Amazon MSK cluster.</p>"
+  "documentation" : "\n               <p>The operations for managing an Amazon MSK cluster.</p>\n            "
 }
\ No newline at end of file
diff --git a/aws-java-sdk-models/src/main/resources/models/kinesisvideo-2017-09-30-intermediate.json b/aws-java-sdk-models/src/main/resources/models/kinesisvideo-2017-09-30-intermediate.json
index dfa766318cb4..d54ba1805120 100644
--- a/aws-java-sdk-models/src/main/resources/models/kinesisvideo-2017-09-30-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/kinesisvideo-2017-09-30-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/mediapackage-2017-10-12-intermediate.json b/aws-java-sdk-models/src/main/resources/models/mediapackage-2017-10-12-intermediate.json
index 9d0013f626dc..473014f8dd66 100644
--- a/aws-java-sdk-models/src/main/resources/models/mediapackage-2017-10-12-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/mediapackage-2017-10-12-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/mediapackage-vod-2018-11-07-intermediate.json b/aws-java-sdk-models/src/main/resources/models/mediapackage-vod-2018-11-07-intermediate.json
index b38220bdf7c3..4938434d1b5a 100644
--- a/aws-java-sdk-models/src/main/resources/models/mediapackage-vod-2018-11-07-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/mediapackage-vod-2018-11-07-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "ClientMutationMethods", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/mediastore-2017-09-01-intermediate.json b/aws-java-sdk-models/src/main/resources/models/mediastore-2017-09-01-intermediate.json
index d8119dc2ac59..f4a0bdbd96ee 100644
--- a/aws-java-sdk-models/src/main/resources/models/mediastore-2017-09-01-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/mediastore-2017-09-01-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "ClientMutationMethods", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/mobile-2017-07-01-intermediate.json b/aws-java-sdk-models/src/main/resources/models/mobile-2017-07-01-intermediate.json
index 4d8f44c74035..d120f268b519 100644
--- a/aws-java-sdk-models/src/main/resources/models/mobile-2017-07-01-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/mobile-2017-07-01-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/models.lex-2017-04-19-intermediate.json b/aws-java-sdk-models/src/main/resources/models/models.lex-2017-04-19-intermediate.json
index 3ee39dd3f84a..ece2120bd36f 100644
--- a/aws-java-sdk-models/src/main/resources/models/models.lex-2017-04-19-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/models.lex-2017-04-19-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientMutationMethods", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : {
       "BotChannelAssociation" : [ "type" ],
       "BotMetadata" : [ "status" ],
diff --git a/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-intermediate.json b/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-intermediate.json
index 56c3b89c7e71..57eb15024c53 100644
--- a/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-intermediate.json
@@ -11319,6 +11319,73 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
+        "c2jName" : "TlsPolicy",
+        "c2jShape" : "TlsPolicy",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>",
+        "enumType" : "TlsPolicy",
+        "fluentSetterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@param tlsPolicy Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+        "fluentSetterMethodName" : "withTlsPolicy",
+        "getterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@return Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@see TlsPolicy*/",
+        "getterMethodName" : "getTlsPolicy",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "TlsPolicy",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "TlsPolicy",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TlsPolicy",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@param tlsPolicy Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@see TlsPolicy*/",
+        "setterMethodName" : "setTlsPolicy",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "tlsPolicy",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@param tlsPolicy Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "tlsPolicy",
+          "variableType" : "String",
+          "documentation" : "<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
         "c2jName" : "SendingPoolName",
         "c2jShape" : "PoolName",
         "deprecated" : false,
@@ -11454,6 +11521,74 @@
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "TlsPolicy" : {
+          "c2jName" : "TlsPolicy",
+          "c2jShape" : "TlsPolicy",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>",
+          "enumType" : "TlsPolicy",
+          "fluentSetterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@param tlsPolicy Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+          "fluentSetterMethodName" : "withTlsPolicy",
+          "getterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@return Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@see TlsPolicy*/",
+          "getterMethodName" : "getTlsPolicy",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "TlsPolicy",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "TlsPolicy",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TlsPolicy",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@param tlsPolicy Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@see TlsPolicy*/",
+          "setterMethodName" : "setTlsPolicy",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tlsPolicy",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>\n@param tlsPolicy Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tlsPolicy",
+            "variableType" : "String",
+            "documentation" : "<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
@@ -38316,6 +38451,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "TlsPolicy",
+        "c2jShape" : "TlsPolicy",
+        "deprecated" : false,
+        "documentation" : "<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>",
+        "enumType" : "TlsPolicy",
+        "fluentSetterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@param tlsPolicy Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+        "fluentSetterMethodName" : "withTlsPolicy",
+        "getterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@return Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@see TlsPolicy*/",
+        "getterMethodName" : "getTlsPolicy",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "TlsPolicy",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "TlsPolicy",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TlsPolicy",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@param tlsPolicy Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@see TlsPolicy*/",
+        "setterMethodName" : "setTlsPolicy",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "tlsPolicy",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@param tlsPolicy Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "tlsPolicy",
+          "variableType" : "String",
+          "documentation" : "<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "SendingPoolName",
         "c2jShape" : "SendingPoolName",
@@ -38520,6 +38722,74 @@
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "TlsPolicy" : {
+          "c2jName" : "TlsPolicy",
+          "c2jShape" : "TlsPolicy",
+          "deprecated" : false,
+          "documentation" : "<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>",
+          "enumType" : "TlsPolicy",
+          "fluentSetterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@param tlsPolicy Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+          "fluentSetterMethodName" : "withTlsPolicy",
+          "getterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@return Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@see TlsPolicy*/",
+          "getterMethodName" : "getTlsPolicy",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "TlsPolicy",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "TlsPolicy",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TlsPolicy",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@param tlsPolicy Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@see TlsPolicy*/",
+          "setterMethodName" : "setTlsPolicy",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tlsPolicy",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>\n@param tlsPolicy Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).\n@return Returns a reference to this object so that method calls can be chained together.\n@see TlsPolicy*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tlsPolicy",
+            "variableType" : "String",
+            "documentation" : "<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
@@ -45750,6 +46020,53 @@
       },
       "wrapper" : false
     },
+    "TlsPolicy" : {
+      "c2jName" : "TlsPolicy",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS). If this parameter is set to <code>Require</code>, Amazon Pinpoint rejects emails that weren't received over TLS. If the parameter is set to <code>Optional</code>, then Amazon Pinpoint accepts emails that weren't received over TLS. The default value is <code>Optional</code>.</p>",
+      "enums" : [ {
+        "name" : "REQUIRE",
+        "value" : "REQUIRE"
+      }, {
+        "name" : "OPTIONAL",
+        "value" : "OPTIONAL"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "TlsPolicy",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "TlsPolicy",
+        "variableName" : "tlsPolicy",
+        "variableType" : "TlsPolicy",
+        "documentation" : null,
+        "simpleType" : "TlsPolicy",
+        "variableSetterType" : "TlsPolicy"
+      },
+      "wrapper" : false
+    },
     "TooManyRequestsException" : {
       "c2jName" : "TooManyRequestsException",
       "customization" : {
diff --git a/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-model.json b/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-model.json
index 231fe9022d67..a02d6eaaa705 100644
--- a/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/pinpoint-email-2018-07-26-model.json
@@ -10,7 +10,6 @@
     "serviceId":"Pinpoint Email",
     "signatureVersion":"v4",
     "signingName":"ses",
-    "targetPrefix":"com.amazonaws.services.pinpoint.email",
     "uid":"pinpoint-email-2018-07-26"
   },
   "operations":{
@@ -1194,6 +1193,10 @@
     "DeliveryOptions":{
       "type":"structure",
       "members":{
+        "TlsPolicy":{
+          "shape":"TlsPolicy",
+          "documentation":"<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.</p>"
+        },
         "SendingPoolName":{
           "shape":"PoolName",
           "documentation":"<p>The name of the dedicated IP pool that you want to associate with the configuration set.</p>"
@@ -2429,6 +2432,10 @@
           "location":"uri",
           "locationName":"ConfigurationSetName"
         },
+        "TlsPolicy":{
+          "shape":"TlsPolicy",
+          "documentation":"<p>Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS).</p>"
+        },
         "SendingPoolName":{
           "shape":"SendingPoolName",
           "documentation":"<p>The name of the dedicated IP pool that you want to associate with the configuration set.</p>"
@@ -2850,6 +2857,14 @@
     },
     "TagValue":{"type":"string"},
     "Timestamp":{"type":"timestamp"},
+    "TlsPolicy":{
+      "type":"string",
+      "documentation":"<p>Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with Transport Layer Security (TLS). If this parameter is set to <code>Require</code>, Amazon Pinpoint rejects emails that weren't received over TLS. If the parameter is set to <code>Optional</code>, then Amazon Pinpoint accepts emails that weren't received over TLS. The default value is <code>Optional</code>.</p>",
+      "enum":[
+        "REQUIRE",
+        "OPTIONAL"
+      ]
+    },
     "TooManyRequestsException":{
       "type":"structure",
       "members":{
diff --git a/aws-java-sdk-models/src/main/resources/models/pinpoint-sms-voice-2018-09-05-intermediate.json b/aws-java-sdk-models/src/main/resources/models/pinpoint-sms-voice-2018-09-05-intermediate.json
index a42646a46948..709e82bd7b47 100644
--- a/aws-java-sdk-models/src/main/resources/models/pinpoint-sms-voice-2018-09-05-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/pinpoint-sms-voice-2018-09-05-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-intermediate.json b/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-intermediate.json
index b9f99c8402b5..ea82b998d483 100644
--- a/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-intermediate.json
@@ -5307,6 +5307,62 @@
       },
       "syncReturnType" : "DBSecurityGroup"
     },
+    "StartActivityStream" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<StartActivityStreamResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<StartActivityStreamResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<StartActivityStreamRequest, StartActivityStreamResult>",
+      "asyncReturnType" : "StartActivityStreamResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Starts a database activity stream to monitor activity on the database. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html\">Database Activity Streams</a> in the <i>Amazon Aurora User Guide</i>.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidDBInstanceStateException",
+        "documentation" : "<p>The DB instance isn't in a valid state.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "InvalidDBClusterStateException",
+        "documentation" : "<p>The requested operation can't be performed while the cluster is in this state.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The specified resource ID was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "DBClusterNotFoundException",
+        "documentation" : "<p> <i>DBClusterIdentifier</i> doesn't refer to an existing DB cluster. </p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "DBInstanceNotFoundException",
+        "documentation" : "<p> <i>DBInstanceIdentifier</i> doesn't refer to an existing DB instance. </p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "KMSKeyNotAccessibleException",
+        "documentation" : "<p>An error occurred accessing an AWS KMS key.</p>",
+        "httpStatusCode" : 400
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StartActivityStreamRequest",
+        "variableName" : "startActivityStreamRequest",
+        "variableType" : "StartActivityStreamRequest",
+        "documentation" : "",
+        "simpleType" : "StartActivityStreamRequest",
+        "variableSetterType" : "StartActivityStreamRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "startActivityStream",
+      "operationName" : "StartActivityStream",
+      "returnType" : {
+        "returnType" : "StartActivityStreamResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "StartActivityStreamResult"
+    },
     "StartDBCluster" : {
       "asyncCallableType" : "java.util.concurrent.Callable<DBCluster>",
       "asyncFutureType" : "java.util.concurrent.Future<DBCluster>",
@@ -5427,6 +5483,58 @@
       },
       "syncReturnType" : "DBInstance"
     },
+    "StopActivityStream" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<StopActivityStreamResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<StopActivityStreamResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<StopActivityStreamRequest, StopActivityStreamResult>",
+      "asyncReturnType" : "StopActivityStreamResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Stops a database activity stream that was started using the AWS console, the <code>start-activity-stream</code> AWS CLI command, or the <code>StartActivityStream</code> action.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html\">Database Activity Streams</a> in the <i>Amazon Aurora User Guide</i>.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidDBInstanceStateException",
+        "documentation" : "<p>The DB instance isn't in a valid state.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "InvalidDBClusterStateException",
+        "documentation" : "<p>The requested operation can't be performed while the cluster is in this state.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The specified resource ID was not found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "DBClusterNotFoundException",
+        "documentation" : "<p> <i>DBClusterIdentifier</i> doesn't refer to an existing DB cluster. </p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "DBInstanceNotFoundException",
+        "documentation" : "<p> <i>DBInstanceIdentifier</i> doesn't refer to an existing DB instance. </p>",
+        "httpStatusCode" : 404
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StopActivityStreamRequest",
+        "variableName" : "stopActivityStreamRequest",
+        "variableType" : "StopActivityStreamRequest",
+        "documentation" : "",
+        "simpleType" : "StopActivityStreamRequest",
+        "variableSetterType" : "StopActivityStreamRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "stopActivityStream",
+      "operationName" : "StopActivityStream",
+      "returnType" : {
+        "returnType" : "StopActivityStreamResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "StopActivityStreamResult"
+    },
     "StopDBCluster" : {
       "asyncCallableType" : "java.util.concurrent.Callable<DBCluster>",
       "asyncFutureType" : "java.util.concurrent.Future<DBCluster>",
@@ -5972,6 +6080,106 @@
       },
       "wrapper" : true
     },
+    "ActivityStreamMode" : {
+      "c2jName" : "ActivityStreamMode",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "Sync",
+        "value" : "sync"
+      }, {
+        "name" : "Async",
+        "value" : "async"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ActivityStreamMode",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ActivityStreamMode",
+        "variableName" : "activityStreamMode",
+        "variableType" : "ActivityStreamMode",
+        "documentation" : null,
+        "simpleType" : "ActivityStreamMode",
+        "variableSetterType" : "ActivityStreamMode"
+      },
+      "wrapper" : false
+    },
+    "ActivityStreamStatus" : {
+      "c2jName" : "ActivityStreamStatus",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "Stopped",
+        "value" : "stopped"
+      }, {
+        "name" : "Starting",
+        "value" : "starting"
+      }, {
+        "name" : "Started",
+        "value" : "started"
+      }, {
+        "name" : "Stopping",
+        "value" : "stopping"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ActivityStreamStatus",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ActivityStreamStatus",
+        "variableName" : "activityStreamStatus",
+        "variableType" : "ActivityStreamStatus",
+        "documentation" : null,
+        "simpleType" : "ActivityStreamStatus",
+        "variableSetterType" : "ActivityStreamStatus"
+      },
+      "wrapper" : false
+    },
     "AddRoleToDBClusterRequest" : {
       "c2jName" : "AddRoleToDBClusterMessage",
       "customization" : {
@@ -48014,6 +48222,274 @@
           "variableSetterType" : "Boolean"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ActivityStreamMode",
+        "c2jShape" : "ActivityStreamMode",
+        "deprecated" : false,
+        "documentation" : "<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+        "enumType" : "ActivityStreamMode",
+        "fluentSetterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param activityStreamMode The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+        "fluentSetterMethodName" : "withActivityStreamMode",
+        "getterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@return The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+        "getterMethodName" : "getActivityStreamMode",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ActivityStreamMode",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ActivityStreamMode",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ActivityStreamMode",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param activityStreamMode The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+        "setterMethodName" : "setActivityStreamMode",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamMode",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param activityStreamMode The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamMode",
+          "variableType" : "String",
+          "documentation" : "<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ActivityStreamStatus",
+        "c2jShape" : "ActivityStreamStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the database activity stream.</p>",
+        "enumType" : "ActivityStreamStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param activityStreamStatus The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+        "fluentSetterMethodName" : "withActivityStreamStatus",
+        "getterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@return The status of the database activity stream.\n@see ActivityStreamStatus*/",
+        "getterMethodName" : "getActivityStreamStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ActivityStreamStatus",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ActivityStreamStatus",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ActivityStreamStatus",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param activityStreamStatus The status of the database activity stream.\n@see ActivityStreamStatus*/",
+        "setterMethodName" : "setActivityStreamStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamStatus",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param activityStreamStatus The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamStatus",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ActivityStreamKmsKeyId",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param activityStreamKmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withActivityStreamKmsKeyId",
+        "getterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@return The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+        "getterMethodName" : "getActivityStreamKmsKeyId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ActivityStreamKmsKeyId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ActivityStreamKmsKeyId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ActivityStreamKmsKeyId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param activityStreamKmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+        "setterMethodName" : "setActivityStreamKmsKeyId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamKmsKeyId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param activityStreamKmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamKmsKeyId",
+          "variableType" : "String",
+          "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ActivityStreamKinesisStreamName",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param activityStreamKinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withActivityStreamKinesisStreamName",
+        "getterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@return The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+        "getterMethodName" : "getActivityStreamKinesisStreamName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ActivityStreamKinesisStreamName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ActivityStreamKinesisStreamName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ActivityStreamKinesisStreamName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param activityStreamKinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+        "setterMethodName" : "setActivityStreamKinesisStreamName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamKinesisStreamName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param activityStreamKinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "activityStreamKinesisStreamName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "CopyTagsToSnapshot",
         "c2jShape" : "Boolean",
@@ -48083,6 +48559,278 @@
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
+        "ActivityStreamKinesisStreamName" : {
+          "c2jName" : "ActivityStreamKinesisStreamName",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param activityStreamKinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withActivityStreamKinesisStreamName",
+          "getterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@return The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+          "getterMethodName" : "getActivityStreamKinesisStreamName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ActivityStreamKinesisStreamName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ActivityStreamKinesisStreamName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ActivityStreamKinesisStreamName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param activityStreamKinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+          "setterMethodName" : "setActivityStreamKinesisStreamName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamKinesisStreamName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param activityStreamKinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamKinesisStreamName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ActivityStreamKmsKeyId" : {
+          "c2jName" : "ActivityStreamKmsKeyId",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param activityStreamKmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withActivityStreamKmsKeyId",
+          "getterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@return The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+          "getterMethodName" : "getActivityStreamKmsKeyId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ActivityStreamKmsKeyId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ActivityStreamKmsKeyId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ActivityStreamKmsKeyId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param activityStreamKmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+          "setterMethodName" : "setActivityStreamKmsKeyId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamKmsKeyId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param activityStreamKmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamKmsKeyId",
+            "variableType" : "String",
+            "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ActivityStreamMode" : {
+          "c2jName" : "ActivityStreamMode",
+          "c2jShape" : "ActivityStreamMode",
+          "deprecated" : false,
+          "documentation" : "<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+          "enumType" : "ActivityStreamMode",
+          "fluentSetterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param activityStreamMode The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+          "fluentSetterMethodName" : "withActivityStreamMode",
+          "getterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@return The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+          "getterMethodName" : "getActivityStreamMode",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ActivityStreamMode",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ActivityStreamMode",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ActivityStreamMode",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param activityStreamMode The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+          "setterMethodName" : "setActivityStreamMode",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamMode",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param activityStreamMode The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamMode",
+            "variableType" : "String",
+            "documentation" : "<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ActivityStreamStatus" : {
+          "c2jName" : "ActivityStreamStatus",
+          "c2jShape" : "ActivityStreamStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the database activity stream.</p>",
+          "enumType" : "ActivityStreamStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param activityStreamStatus The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+          "fluentSetterMethodName" : "withActivityStreamStatus",
+          "getterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@return The status of the database activity stream.\n@see ActivityStreamStatus*/",
+          "getterMethodName" : "getActivityStreamStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ActivityStreamStatus",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ActivityStreamStatus",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ActivityStreamStatus",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param activityStreamStatus The status of the database activity stream.\n@see ActivityStreamStatus*/",
+          "setterMethodName" : "setActivityStreamStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamStatus",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param activityStreamStatus The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "activityStreamStatus",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
         "AllocatedStorage" : {
           "c2jName" : "AllocatedStorage",
           "c2jShape" : "IntegerOptional",
@@ -225732,6 +226480,1309 @@
       },
       "wrapper" : false
     },
+    "StartActivityStreamRequest" : {
+      "c2jName" : "StartActivityStreamRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "StartActivityStream",
+        "locationName" : null,
+        "requestUri" : "/",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ResourceArn",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@return The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ResourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ResourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Mode",
+        "c2jShape" : "ActivityStreamMode",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+        "enumType" : "ActivityStreamMode",
+        "fluentSetterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param mode Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+        "fluentSetterMethodName" : "withMode",
+        "getterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@return Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+        "getterMethodName" : "getMode",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "Mode",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "Mode",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Mode",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param mode Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+        "setterMethodName" : "setMode",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "mode",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param mode Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "mode",
+          "variableType" : "String",
+          "documentation" : "<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "KmsKeyId",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@param kmsKeyId The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKmsKeyId",
+        "getterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@return The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.*/",
+        "getterMethodName" : "getKmsKeyId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "KmsKeyId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "KmsKeyId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KmsKeyId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@param kmsKeyId The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.*/",
+        "setterMethodName" : "setKmsKeyId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kmsKeyId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@param kmsKeyId The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kmsKeyId",
+          "variableType" : "String",
+          "documentation" : "<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ApplyImmediately",
+        "c2jShape" : "BooleanOptional",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withApplyImmediately",
+        "getterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@return Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.*/",
+        "getterMethodName" : "getApplyImmediately",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ApplyImmediately",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ApplyImmediately",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "ApplyImmediately",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.*/",
+        "setterMethodName" : "setApplyImmediately",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "applyImmediately",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "applyImmediately",
+          "variableType" : "Boolean",
+          "documentation" : "<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ApplyImmediately" : {
+          "c2jName" : "ApplyImmediately",
+          "c2jShape" : "BooleanOptional",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withApplyImmediately",
+          "getterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@return Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.*/",
+          "getterMethodName" : "getApplyImmediately",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ApplyImmediately",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ApplyImmediately",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "ApplyImmediately",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.*/",
+          "setterMethodName" : "setApplyImmediately",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "applyImmediately",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "applyImmediately",
+            "variableType" : "Boolean",
+            "documentation" : "<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KmsKeyId" : {
+          "c2jName" : "KmsKeyId",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@param kmsKeyId The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKmsKeyId",
+          "getterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@return The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.*/",
+          "getterMethodName" : "getKmsKeyId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "KmsKeyId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "KmsKeyId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KmsKeyId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@param kmsKeyId The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.*/",
+          "setterMethodName" : "setKmsKeyId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kmsKeyId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>\n@param kmsKeyId The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kmsKeyId",
+            "variableType" : "String",
+            "documentation" : "<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Mode" : {
+          "c2jName" : "Mode",
+          "c2jShape" : "ActivityStreamMode",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+          "enumType" : "ActivityStreamMode",
+          "fluentSetterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param mode Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+          "fluentSetterMethodName" : "withMode",
+          "getterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@return Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+          "getterMethodName" : "getMode",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "Mode",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "Mode",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Mode",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param mode Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@see ActivityStreamMode*/",
+          "setterMethodName" : "setMode",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "mode",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>\n@param mode Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "mode",
+            "variableType" : "String",
+            "documentation" : "<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResourceArn" : {
+          "c2jName" : "ResourceArn",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@return The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ResourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ResourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ResourceArn", "Mode", "KmsKeyId" ],
+      "shapeName" : "StartActivityStreamRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StartActivityStreamRequest",
+        "variableName" : "startActivityStreamRequest",
+        "variableType" : "StartActivityStreamRequest",
+        "documentation" : null,
+        "simpleType" : "StartActivityStreamRequest",
+        "variableSetterType" : "StartActivityStreamRequest"
+      },
+      "wrapper" : false
+    },
+    "StartActivityStreamResult" : {
+      "c2jName" : "StartActivityStreamResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "KmsKeyId",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier for encryption of messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKmsKeyId",
+        "getterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@return The AWS KMS key identifier for encryption of messages in the database activity stream.*/",
+        "getterMethodName" : "getKmsKeyId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "KmsKeyId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "KmsKeyId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KmsKeyId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier for encryption of messages in the database activity stream.*/",
+        "setterMethodName" : "setKmsKeyId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kmsKeyId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier for encryption of messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kmsKeyId",
+          "variableType" : "String",
+          "documentation" : "<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "KinesisStreamName",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream to be used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKinesisStreamName",
+        "getterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@return The name of the Amazon Kinesis data stream to be used for the database activity stream.*/",
+        "getterMethodName" : "getKinesisStreamName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "KinesisStreamName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "KinesisStreamName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KinesisStreamName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream to be used for the database activity stream.*/",
+        "setterMethodName" : "setKinesisStreamName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kinesisStreamName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream to be used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kinesisStreamName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Status",
+        "c2jShape" : "ActivityStreamStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the database activity stream.</p>",
+        "enumType" : "ActivityStreamStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+        "fluentSetterMethodName" : "withStatus",
+        "getterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@return The status of the database activity stream.\n@see ActivityStreamStatus*/",
+        "getterMethodName" : "getStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "Status",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "Status",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Status",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@see ActivityStreamStatus*/",
+        "setterMethodName" : "setStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Mode",
+        "c2jShape" : "ActivityStreamMode",
+        "deprecated" : false,
+        "documentation" : "<p>The mode of the database activity stream.</p>",
+        "enumType" : "ActivityStreamMode",
+        "fluentSetterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@param mode The mode of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+        "fluentSetterMethodName" : "withMode",
+        "getterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@return The mode of the database activity stream.\n@see ActivityStreamMode*/",
+        "getterMethodName" : "getMode",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "Mode",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "Mode",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Mode",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@param mode The mode of the database activity stream.\n@see ActivityStreamMode*/",
+        "setterMethodName" : "setMode",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "mode",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@param mode The mode of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "mode",
+          "variableType" : "String",
+          "documentation" : "<p>The mode of the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ApplyImmediately",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withApplyImmediately",
+        "getterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@return Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.*/",
+        "getterMethodName" : "getApplyImmediately",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ApplyImmediately",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ApplyImmediately",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "ApplyImmediately",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.*/",
+        "setterMethodName" : "setApplyImmediately",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "applyImmediately",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "applyImmediately",
+          "variableType" : "Boolean",
+          "documentation" : "<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ApplyImmediately" : {
+          "c2jName" : "ApplyImmediately",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withApplyImmediately",
+          "getterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@return Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.*/",
+          "getterMethodName" : "getApplyImmediately",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ApplyImmediately",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ApplyImmediately",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "ApplyImmediately",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.*/",
+          "setterMethodName" : "setApplyImmediately",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "applyImmediately",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "applyImmediately",
+            "variableType" : "Boolean",
+            "documentation" : "<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KinesisStreamName" : {
+          "c2jName" : "KinesisStreamName",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream to be used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKinesisStreamName",
+          "getterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@return The name of the Amazon Kinesis data stream to be used for the database activity stream.*/",
+          "getterMethodName" : "getKinesisStreamName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "KinesisStreamName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "KinesisStreamName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KinesisStreamName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream to be used for the database activity stream.*/",
+          "setterMethodName" : "setKinesisStreamName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kinesisStreamName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream to be used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kinesisStreamName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KmsKeyId" : {
+          "c2jName" : "KmsKeyId",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier for encryption of messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKmsKeyId",
+          "getterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@return The AWS KMS key identifier for encryption of messages in the database activity stream.*/",
+          "getterMethodName" : "getKmsKeyId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "KmsKeyId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "KmsKeyId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KmsKeyId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier for encryption of messages in the database activity stream.*/",
+          "setterMethodName" : "setKmsKeyId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kmsKeyId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier for encryption of messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kmsKeyId",
+            "variableType" : "String",
+            "documentation" : "<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Mode" : {
+          "c2jName" : "Mode",
+          "c2jShape" : "ActivityStreamMode",
+          "deprecated" : false,
+          "documentation" : "<p>The mode of the database activity stream.</p>",
+          "enumType" : "ActivityStreamMode",
+          "fluentSetterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@param mode The mode of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+          "fluentSetterMethodName" : "withMode",
+          "getterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@return The mode of the database activity stream.\n@see ActivityStreamMode*/",
+          "getterMethodName" : "getMode",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "Mode",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "Mode",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Mode",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@param mode The mode of the database activity stream.\n@see ActivityStreamMode*/",
+          "setterMethodName" : "setMode",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "mode",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The mode of the database activity stream.</p>\n@param mode The mode of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamMode*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "mode",
+            "variableType" : "String",
+            "documentation" : "<p>The mode of the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Status" : {
+          "c2jName" : "Status",
+          "c2jShape" : "ActivityStreamStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the database activity stream.</p>",
+          "enumType" : "ActivityStreamStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+          "fluentSetterMethodName" : "withStatus",
+          "getterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@return The status of the database activity stream.\n@see ActivityStreamStatus*/",
+          "getterMethodName" : "getStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "Status",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "Status",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Status",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@see ActivityStreamStatus*/",
+          "setterMethodName" : "setStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "StartActivityStreamResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : "StartActivityStreamResult"
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StartActivityStreamResult",
+        "variableName" : "startActivityStreamResult",
+        "variableType" : "StartActivityStreamResult",
+        "documentation" : null,
+        "simpleType" : "StartActivityStreamResult",
+        "variableSetterType" : "StartActivityStreamResult"
+      },
+      "wrapper" : false
+    },
     "StartDBClusterRequest" : {
       "c2jName" : "StartDBClusterMessage",
       "customization" : {
@@ -226094,6 +228145,769 @@
       },
       "wrapper" : false
     },
+    "StopActivityStreamRequest" : {
+      "c2jName" : "StopActivityStreamRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "StopActivityStream",
+        "locationName" : null,
+        "requestUri" : "/",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ResourceArn",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@return The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ResourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ResourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ApplyImmediately",
+        "c2jShape" : "BooleanOptional",
+        "deprecated" : false,
+        "documentation" : "<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withApplyImmediately",
+        "getterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@return Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.*/",
+        "getterMethodName" : "getApplyImmediately",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ApplyImmediately",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ApplyImmediately",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "ApplyImmediately",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.*/",
+        "setterMethodName" : "setApplyImmediately",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "applyImmediately",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "applyImmediately",
+          "variableType" : "Boolean",
+          "documentation" : "<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ApplyImmediately" : {
+          "c2jName" : "ApplyImmediately",
+          "c2jShape" : "BooleanOptional",
+          "deprecated" : false,
+          "documentation" : "<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withApplyImmediately",
+          "getterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@return Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.*/",
+          "getterMethodName" : "getApplyImmediately",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ApplyImmediately",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ApplyImmediately",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "ApplyImmediately",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.*/",
+          "setterMethodName" : "setApplyImmediately",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "applyImmediately",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>\n@param applyImmediately Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "applyImmediately",
+            "variableType" : "Boolean",
+            "documentation" : "<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResourceArn" : {
+          "c2jName" : "ResourceArn",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@return The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ResourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ResourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>\n@param resourceArn The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "ResourceArn" ],
+      "shapeName" : "StopActivityStreamRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StopActivityStreamRequest",
+        "variableName" : "stopActivityStreamRequest",
+        "variableType" : "StopActivityStreamRequest",
+        "documentation" : null,
+        "simpleType" : "StopActivityStreamRequest",
+        "variableSetterType" : "StopActivityStreamRequest"
+      },
+      "wrapper" : false
+    },
+    "StopActivityStreamResult" : {
+      "c2jName" : "StopActivityStreamResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "KmsKeyId",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKmsKeyId",
+        "getterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@return The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+        "getterMethodName" : "getKmsKeyId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "KmsKeyId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "KmsKeyId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KmsKeyId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+        "setterMethodName" : "setKmsKeyId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kmsKeyId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kmsKeyId",
+          "variableType" : "String",
+          "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "KinesisStreamName",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withKinesisStreamName",
+        "getterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@return The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+        "getterMethodName" : "getKinesisStreamName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "KinesisStreamName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "KinesisStreamName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "KinesisStreamName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+        "setterMethodName" : "setKinesisStreamName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kinesisStreamName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "kinesisStreamName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Status",
+        "c2jShape" : "ActivityStreamStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the database activity stream.</p>",
+        "enumType" : "ActivityStreamStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+        "fluentSetterMethodName" : "withStatus",
+        "getterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@return The status of the database activity stream.\n@see ActivityStreamStatus*/",
+        "getterMethodName" : "getStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "Status",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "Status",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Status",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@see ActivityStreamStatus*/",
+        "setterMethodName" : "setStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "status",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the database activity stream.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "KinesisStreamName" : {
+          "c2jName" : "KinesisStreamName",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKinesisStreamName",
+          "getterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@return The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+          "getterMethodName" : "getKinesisStreamName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "KinesisStreamName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "KinesisStreamName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KinesisStreamName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.*/",
+          "setterMethodName" : "setKinesisStreamName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kinesisStreamName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>\n@param kinesisStreamName The name of the Amazon Kinesis data stream used for the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kinesisStreamName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "KmsKeyId" : {
+          "c2jName" : "KmsKeyId",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withKmsKeyId",
+          "getterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@return The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+          "getterMethodName" : "getKmsKeyId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "KmsKeyId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "KmsKeyId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "KmsKeyId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.*/",
+          "setterMethodName" : "setKmsKeyId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kmsKeyId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>\n@param kmsKeyId The AWS KMS key identifier used for encrypting messages in the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "kmsKeyId",
+            "variableType" : "String",
+            "documentation" : "<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Status" : {
+          "c2jName" : "Status",
+          "c2jShape" : "ActivityStreamStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the database activity stream.</p>",
+          "enumType" : "ActivityStreamStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+          "fluentSetterMethodName" : "withStatus",
+          "getterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@return The status of the database activity stream.\n@see ActivityStreamStatus*/",
+          "getterMethodName" : "getStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "Status",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "Status",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Status",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@see ActivityStreamStatus*/",
+          "setterMethodName" : "setStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the database activity stream.</p>\n@param status The status of the database activity stream.\n@return Returns a reference to this object so that method calls can be chained together.\n@see ActivityStreamStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "status",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the database activity stream.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "StopActivityStreamResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : "StopActivityStreamResult"
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StopActivityStreamResult",
+        "variableName" : "stopActivityStreamResult",
+        "variableType" : "StopActivityStreamResult",
+        "documentation" : null,
+        "simpleType" : "StopActivityStreamResult",
+        "variableSetterType" : "StopActivityStreamResult"
+      },
+      "wrapper" : false
+    },
     "StopDBClusterRequest" : {
       "c2jName" : "StopDBClusterMessage",
       "customization" : {
diff --git a/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-model.json b/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-model.json
index a6648fb5c8c6..fce6e88cf9c1 100644
--- a/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/rds-2014-10-31-model.json
@@ -1929,6 +1929,27 @@
       ],
       "documentation":"<p>Revokes ingress from a DBSecurityGroup for previously authorized IP ranges or EC2 or VPC Security Groups. Required parameters for this API are one of CIDRIP, EC2SecurityGroupId for VPC, or (EC2SecurityGroupOwnerId and either EC2SecurityGroupName or EC2SecurityGroupId).</p>"
     },
+    "StartActivityStream":{
+      "name":"StartActivityStream",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StartActivityStreamRequest"},
+      "output":{
+        "shape":"StartActivityStreamResponse",
+        "resultWrapper":"StartActivityStreamResult"
+      },
+      "errors":[
+        {"shape":"InvalidDBInstanceStateFault"},
+        {"shape":"InvalidDBClusterStateFault"},
+        {"shape":"ResourceNotFoundFault"},
+        {"shape":"DBClusterNotFoundFault"},
+        {"shape":"DBInstanceNotFoundFault"},
+        {"shape":"KMSKeyNotAccessibleFault"}
+      ],
+      "documentation":"<p>Starts a database activity stream to monitor activity on the database. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html\">Database Activity Streams</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+    },
     "StartDBCluster":{
       "name":"StartDBCluster",
       "http":{
@@ -1973,6 +1994,26 @@
       ],
       "documentation":"<p> Starts an Amazon RDS DB instance that was stopped using the AWS console, the stop-db-instance AWS CLI command, or the StopDBInstance action. </p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_StartInstance.html\"> Starting an Amazon RDS DB instance That Was Previously Stopped</a> in the <i>Amazon RDS User Guide.</i> </p> <note> <p> This command doesn't apply to Aurora MySQL and Aurora PostgreSQL. For Aurora DB clusters, use <code>StartDBCluster</code> instead. </p> </note>"
     },
+    "StopActivityStream":{
+      "name":"StopActivityStream",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"StopActivityStreamRequest"},
+      "output":{
+        "shape":"StopActivityStreamResponse",
+        "resultWrapper":"StopActivityStreamResult"
+      },
+      "errors":[
+        {"shape":"InvalidDBInstanceStateFault"},
+        {"shape":"InvalidDBClusterStateFault"},
+        {"shape":"ResourceNotFoundFault"},
+        {"shape":"DBClusterNotFoundFault"},
+        {"shape":"DBInstanceNotFoundFault"}
+      ],
+      "documentation":"<p>Stops a database activity stream that was started using the AWS console, the <code>start-activity-stream</code> AWS CLI command, or the <code>StartActivityStream</code> action.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html\">Database Activity Streams</a> in the <i>Amazon Aurora User Guide</i>.</p>"
+    },
     "StopDBCluster":{
       "name":"StopDBCluster",
       "http":{
@@ -2049,6 +2090,22 @@
         "locationName":"AccountQuota"
       }
     },
+    "ActivityStreamMode":{
+      "type":"string",
+      "enum":[
+        "sync",
+        "async"
+      ]
+    },
+    "ActivityStreamStatus":{
+      "type":"string",
+      "enum":[
+        "stopped",
+        "starting",
+        "started",
+        "stopping"
+      ]
+    },
     "AddRoleToDBClusterMessage":{
       "type":"structure",
       "required":[
@@ -3553,6 +3610,22 @@
           "shape":"Boolean",
           "documentation":"<note> <p>HTTP endpoint functionality is in beta for Aurora Serverless and is subject to change.</p> </note> <p>A value that indicates whether the HTTP endpoint for an Aurora Serverless DB cluster is enabled.</p> <p>When enabled, the HTTP endpoint provides a connectionless web service API for running SQL queries on the Aurora Serverless DB cluster. You can also query your database from inside the RDS console with the query editor.</p> <p>For more information about Aurora Serverless, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html\">Using Amazon Aurora Serverless</a> in the <i>Amazon Aurora User Guide</i>.</p>"
         },
+        "ActivityStreamMode":{
+          "shape":"ActivityStreamMode",
+          "documentation":"<p>The mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>"
+        },
+        "ActivityStreamStatus":{
+          "shape":"ActivityStreamStatus",
+          "documentation":"<p>The status of the database activity stream.</p>"
+        },
+        "ActivityStreamKmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>"
+        },
+        "ActivityStreamKinesisStreamName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>"
+        },
         "CopyTagsToSnapshot":{
           "shape":"Boolean",
           "documentation":"<p>Specifies whether tags are copied from the DB cluster to snapshots of the DB cluster.</p>"
@@ -10250,6 +10323,57 @@
         "db-cluster-snapshot"
       ]
     },
+    "StartActivityStreamRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Mode",
+        "KmsKeyId"
+      ],
+      "members":{
+        "ResourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the DB cluster, for example <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.</p>"
+        },
+        "Mode":{
+          "shape":"ActivityStreamMode",
+          "documentation":"<p>Specifies the mode of the database activity stream. Database events such as a change or access generate an activity stream event. The database session can handle these events either synchronously or asynchronously. </p>"
+        },
+        "KmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be either a key ID, a key ARN, or a key alias.</p>"
+        },
+        "ApplyImmediately":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.</p>"
+        }
+      }
+    },
+    "StartActivityStreamResponse":{
+      "type":"structure",
+      "members":{
+        "KmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The AWS KMS key identifier for encryption of messages in the database activity stream.</p>"
+        },
+        "KinesisStreamName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>"
+        },
+        "Status":{
+          "shape":"ActivityStreamStatus",
+          "documentation":"<p>The status of the database activity stream.</p>"
+        },
+        "Mode":{
+          "shape":"ActivityStreamMode",
+          "documentation":"<p>The mode of the database activity stream.</p>"
+        },
+        "ApplyImmediately":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.</p>"
+        }
+      }
+    },
     "StartDBClusterMessage":{
       "type":"structure",
       "required":["DBClusterIdentifier"],
@@ -10282,6 +10406,37 @@
         "DBInstance":{"shape":"DBInstance"}
       }
     },
+    "StopActivityStreamRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{
+          "shape":"String",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example, <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>. </p>"
+        },
+        "ApplyImmediately":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the maintenance window for the database.</p>"
+        }
+      }
+    },
+    "StopActivityStreamResponse":{
+      "type":"structure",
+      "members":{
+        "KmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The AWS KMS key identifier used for encrypting messages in the database activity stream.</p>"
+        },
+        "KinesisStreamName":{
+          "shape":"String",
+          "documentation":"<p>The name of the Amazon Kinesis data stream used for the database activity stream.</p>"
+        },
+        "Status":{
+          "shape":"ActivityStreamStatus",
+          "documentation":"<p>The status of the database activity stream.</p>"
+        }
+      }
+    },
     "StopDBClusterMessage":{
       "type":"structure",
       "required":["DBClusterIdentifier"],
diff --git a/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-intermediate.json b/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-intermediate.json
index ef7c43e1b5f5..51502e024600 100644
--- a/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
@@ -55,7 +55,7 @@
     "defaultEndpoint" : "rds-data.us-east-1.amazonaws.com",
     "defaultEndpointWithoutHttpProtocol" : "rds-data.us-east-1.amazonaws.com",
     "defaultRegion" : null,
-    "documentation" : "AWS RDS DataService provides Http Endpoint to query RDS databases.",
+    "documentation" : "<fullname>Amazon RDS Data Service</fullname>\n        <p>Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora\n            Serverless DB cluster. To run these statements, you work with the Data Service\n            API.</p>\n        <p>For more information about the Data Service API, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html\">Using the Data API for Aurora\n                Serverless</a> in the <i>Amazon Aurora User Guide</i>.</p>",
     "endpointPrefix" : "rds-data",
     "hasApiWithStreamInput" : false,
     "ionProtocol" : false,
@@ -84,32 +84,188 @@
     "xmlProtocol" : false
   },
   "operations" : {
+    "BatchExecuteStatement" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<BatchExecuteStatementResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<BatchExecuteStatementResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<BatchExecuteStatementRequest, BatchExecuteStatementResult>",
+      "asyncReturnType" : "BatchExecuteStatementResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Runs a batch SQL statement over an array of data.</p>\n        <p>You can run bulk update and insert operations for multiple records using a DML \n            statement with different parameter sets. Bulk operations can provide a significant \n            performance improvement over individual insert and update operations.</p>\n        <important>    \n            <p>If a call isn't part of a transaction because it doesn't include the\n                    <code>transactionID</code> parameter, changes that result from the call are\n                committed automatically.</p>    \n        </important>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "<p>There are insufficient privileges to make the call.</p>",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "<p>An internal error occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableErrorException",
+        "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "StatementTimeoutException",
+        "documentation" : "<p>The execution of the SQL statement timed out.</p>",
+        "httpStatusCode" : 400
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchExecuteStatementRequest",
+        "variableName" : "batchExecuteStatementRequest",
+        "variableType" : "BatchExecuteStatementRequest",
+        "documentation" : "<p>The request parameters represent the input of a SQL statement over an array of\n            data.</p>",
+        "simpleType" : "BatchExecuteStatementRequest",
+        "variableSetterType" : "BatchExecuteStatementRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "batchExecuteStatement",
+      "operationName" : "BatchExecuteStatement",
+      "returnType" : {
+        "returnType" : "BatchExecuteStatementResult",
+        "documentation" : "<p>The response elements represent the output of a SQL statement over an array of\n            data.</p>"
+      },
+      "syncReturnType" : "BatchExecuteStatementResult"
+    },
+    "BeginTransaction" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<BeginTransactionResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<BeginTransactionResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<BeginTransactionRequest, BeginTransactionResult>",
+      "asyncReturnType" : "BeginTransactionResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Starts a SQL transaction.</p>\n        \n        <important>\n            <p>A transaction can run for a maximum of 24 hours. A transaction is terminated and \n                rolled back automatically after 24 hours.</p>\n            <p>A transaction times out if no calls use its transaction ID in three minutes. \n                If a transaction times out before it's committed, it's rolled back\n                automatically.</p>\n            <p>DDL statements inside a transaction cause an implicit commit. We recommend \n                that you run each DDL statement in a separate <code>ExecuteStatement</code> call with \n                <code>continueAfterTimeout</code> enabled.</p>\n        </important>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "<p>There are insufficient privileges to make the call.</p>",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "<p>An internal error occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableErrorException",
+        "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "StatementTimeoutException",
+        "documentation" : "<p>The execution of the SQL statement timed out.</p>",
+        "httpStatusCode" : 400
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BeginTransactionRequest",
+        "variableName" : "beginTransactionRequest",
+        "variableType" : "BeginTransactionRequest",
+        "documentation" : "<p>The request parameters represent the input of a request to start a SQL\n            transaction.</p>",
+        "simpleType" : "BeginTransactionRequest",
+        "variableSetterType" : "BeginTransactionRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "beginTransaction",
+      "operationName" : "BeginTransaction",
+      "returnType" : {
+        "returnType" : "BeginTransactionResult",
+        "documentation" : "<p>The response elements represent the output of a request to start a SQL\n            transaction.</p>"
+      },
+      "syncReturnType" : "BeginTransactionResult"
+    },
+    "CommitTransaction" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<CommitTransactionResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<CommitTransactionResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<CommitTransactionRequest, CommitTransactionResult>",
+      "asyncReturnType" : "CommitTransactionResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Ends a SQL transaction started with the <code>BeginTransaction</code> operation and\n            commits the changes.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "<p>There are insufficient privileges to make the call.</p>",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "<p>An internal error occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "NotFoundException",
+        "documentation" : "<p>The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ServiceUnavailableErrorException",
+        "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CommitTransactionRequest",
+        "variableName" : "commitTransactionRequest",
+        "variableType" : "CommitTransactionRequest",
+        "documentation" : "<p>The request parameters represent the input of a commit transaction request.</p>",
+        "simpleType" : "CommitTransactionRequest",
+        "variableSetterType" : "CommitTransactionRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "commitTransaction",
+      "operationName" : "CommitTransaction",
+      "returnType" : {
+        "returnType" : "CommitTransactionResult",
+        "documentation" : "<p>The response elements represent the output of a commit transaction request.</p>"
+      },
+      "syncReturnType" : "CommitTransactionResult"
+    },
     "ExecuteSql" : {
       "asyncCallableType" : "java.util.concurrent.Callable<ExecuteSqlResult>",
       "asyncFutureType" : "java.util.concurrent.Future<ExecuteSqlResult>",
       "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ExecuteSqlRequest, ExecuteSqlResult>",
       "asyncReturnType" : "ExecuteSqlResult",
       "authenticated" : true,
-      "deprecated" : false,
-      "documentation" : "Executes any SQL statement on the target database synchronously",
+      "deprecated" : true,
+      "documentation" : "<p>Runs one or more SQL statements.</p>\n        <important>\n            <p>This operation is deprecated. Use the <code>BatchExecuteStatement</code> or\n                    <code>ExecuteStatement</code> operation.</p>\n        </important>",
       "endpointDiscovery" : null,
       "endpointOperation" : false,
       "endpointTrait" : null,
       "exceptions" : [ {
         "exceptionName" : "BadRequestException",
-        "documentation" : "Invalid Request exception",
+        "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
         "httpStatusCode" : 400
       }, {
         "exceptionName" : "ForbiddenException",
-        "documentation" : "Access denied exception",
+        "documentation" : "<p>There are insufficient privileges to make the call.</p>",
         "httpStatusCode" : 403
       }, {
         "exceptionName" : "InternalServerErrorException",
-        "documentation" : "Internal service error",
+        "documentation" : "<p>An internal error occurred.</p>",
         "httpStatusCode" : 500
       }, {
         "exceptionName" : "ServiceUnavailableErrorException",
-        "documentation" : "Internal service unavailable error",
+        "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
         "httpStatusCode" : 503
       } ],
       "hasBlobMemberAsPayload" : false,
@@ -119,7 +275,7 @@
         "variableDeclarationType" : "ExecuteSqlRequest",
         "variableName" : "executeSqlRequest",
         "variableType" : "ExecuteSqlRequest",
-        "documentation" : "Execute SQL Request",
+        "documentation" : "<p>The request parameters represent the input of a request to run one or more SQL\n            statements.</p>",
         "simpleType" : "ExecuteSqlRequest",
         "variableSetterType" : "ExecuteSqlRequest"
       },
@@ -128,9 +284,113 @@
       "operationName" : "ExecuteSql",
       "returnType" : {
         "returnType" : "ExecuteSqlResult",
-        "documentation" : "Execute SQL response"
+        "documentation" : "<p>The response elements represent the output of a request to run one or more SQL\n            statements.</p>"
       },
       "syncReturnType" : "ExecuteSqlResult"
+    },
+    "ExecuteStatement" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ExecuteStatementResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ExecuteStatementResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ExecuteStatementRequest, ExecuteStatementResult>",
+      "asyncReturnType" : "ExecuteStatementResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Runs a SQL statement against a database.</p>\n        <important>    \n            <p>If a call isn't part of a transaction because it doesn't include the\n                    <code>transactionID</code> parameter, changes that result from the call are\n                committed automatically.</p>    \n        </important>\n        <p>The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over 1,000 records, the call is terminated.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "<p>There are insufficient privileges to make the call.</p>",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "<p>An internal error occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "ServiceUnavailableErrorException",
+        "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
+        "httpStatusCode" : 503
+      }, {
+        "exceptionName" : "StatementTimeoutException",
+        "documentation" : "<p>The execution of the SQL statement timed out.</p>",
+        "httpStatusCode" : 400
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ExecuteStatementRequest",
+        "variableName" : "executeStatementRequest",
+        "variableType" : "ExecuteStatementRequest",
+        "documentation" : "<p>The request parameters represent the input of a request to run a SQL statement against\n            a database.</p>",
+        "simpleType" : "ExecuteStatementRequest",
+        "variableSetterType" : "ExecuteStatementRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "executeStatement",
+      "operationName" : "ExecuteStatement",
+      "returnType" : {
+        "returnType" : "ExecuteStatementResult",
+        "documentation" : "<p>The response elements represent the output of a request to run a SQL statement against\n            a database.</p>"
+      },
+      "syncReturnType" : "ExecuteStatementResult"
+    },
+    "RollbackTransaction" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<RollbackTransactionResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<RollbackTransactionResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<RollbackTransactionRequest, RollbackTransactionResult>",
+      "asyncReturnType" : "RollbackTransactionResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Performs a rollback of a transaction. Rolling back a transaction cancels its changes.</p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "BadRequestException",
+        "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
+        "httpStatusCode" : 400
+      }, {
+        "exceptionName" : "ForbiddenException",
+        "documentation" : "<p>There are insufficient privileges to make the call.</p>",
+        "httpStatusCode" : 403
+      }, {
+        "exceptionName" : "InternalServerErrorException",
+        "documentation" : "<p>An internal error occurred.</p>",
+        "httpStatusCode" : 500
+      }, {
+        "exceptionName" : "NotFoundException",
+        "documentation" : "<p>The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.</p>",
+        "httpStatusCode" : 404
+      }, {
+        "exceptionName" : "ServiceUnavailableErrorException",
+        "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
+        "httpStatusCode" : 503
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "RollbackTransactionRequest",
+        "variableName" : "rollbackTransactionRequest",
+        "variableType" : "RollbackTransactionRequest",
+        "documentation" : "<p>The request parameters represent the input of a request to perform a rollback of a\n            transaction.</p>",
+        "simpleType" : "RollbackTransactionRequest",
+        "variableSetterType" : "RollbackTransactionRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "rollbackTransaction",
+      "operationName" : "RollbackTransaction",
+      "returnType" : {
+        "returnType" : "RollbackTransactionResult",
+        "documentation" : "<p>The response elements represent the output of a request to perform a rollback of a\n            transaction.</p>"
+      },
+      "syncReturnType" : "RollbackTransactionResult"
     }
   },
   "shapes" : {
@@ -143,7 +403,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Invalid Request exception",
+      "documentation" : "<p>There is an error in the call or in a SQL statement.</p>",
       "enums" : null,
       "errorCode" : "BadRequestException",
       "hasHeaderMember" : false,
@@ -172,8 +432,8 @@
       },
       "wrapper" : false
     },
-    "ColumnMetadata" : {
-      "c2jName" : "ColumnMetadata",
+    "BatchExecuteStatementRequest" : {
+      "c2jName" : "BatchExecuteStatementRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -181,7 +441,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Column Metadata",
+      "documentation" : "<p>The request parameters represent the input of a SQL statement over an array of\n            data.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -189,19 +449,26 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "BatchExecuteStatement",
+        "locationName" : null,
+        "requestUri" : "/BatchExecute",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "arrayBaseColumnType",
-        "c2jShape" : "Integer",
+        "c2jName" : "database",
+        "c2jShape" : "DbName",
         "deprecated" : false,
-        "documentation" : "Homogenous array base SQL type from java.sql.Types.",
+        "documentation" : "<p>The name of the database.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@param arrayBaseColumnType Homogenous array base SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withArrayBaseColumnType",
-        "getterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@return Homogenous array base SQL type from java.sql.Types.*/",
-        "getterMethodName" : "getArrayBaseColumnType",
+        "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatabase",
+        "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+        "getterMethodName" : "getDatabase",
         "getterModel" : {
-          "returnType" : "Integer",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -214,11 +481,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "arrayBaseColumnType",
+          "marshallLocationName" : "database",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "arrayBaseColumnType",
+          "unmarshallLocationName" : "database",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -228,47 +495,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "ArrayBaseColumnType",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Database",
         "sensitive" : false,
-        "setterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@param arrayBaseColumnType Homogenous array base SQL type from java.sql.Types.*/",
-        "setterMethodName" : "setArrayBaseColumnType",
+        "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+        "setterMethodName" : "setDatabase",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "arrayBaseColumnType",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@param arrayBaseColumnType Homogenous array base SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "arrayBaseColumnType",
-          "variableType" : "Integer",
-          "documentation" : "Homogenous array base SQL type from java.sql.Types.",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "isAutoIncrement",
-        "c2jShape" : "Boolean",
+        "c2jName" : "parameterSets",
+        "c2jShape" : "SqlParameterSets",
         "deprecated" : false,
-        "documentation" : "Whether the designated column is automatically numbered",
+        "documentation" : "<p>The parameter set for the batch operation.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Whether the designated column is automatically numbered\n@param isAutoIncrement Whether the designated column is automatically numbered\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withIsAutoIncrement",
-        "getterDocumentation" : "/**Whether the designated column is automatically numbered\n@return Whether the designated column is automatically numbered*/",
-        "getterMethodName" : "getIsAutoIncrement",
+        "fluentSetterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n@param parameterSets The parameter set for the batch operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withParameterSets",
+        "getterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n@return The parameter set for the batch operation.*/",
+        "getterMethodName" : "getParameterSets",
         "getterModel" : {
-          "returnType" : "Boolean",
+          "returnType" : "java.util.List<java.util.List<SqlParameter>>",
           "documentation" : null
         },
         "http" : {
@@ -281,128 +548,225 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "isAutoIncrement",
+          "marshallLocationName" : "parameterSets",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "isAutoIncrement",
+          "unmarshallLocationName" : "parameterSets",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Boolean",
-        "marshallingType" : "BOOLEAN",
-        "name" : "IsAutoIncrement",
-        "sensitive" : false,
-        "setterDocumentation" : "/**Whether the designated column is automatically numbered\n@param isAutoIncrement Whether the designated column is automatically numbered*/",
-        "setterMethodName" : "setIsAutoIncrement",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isAutoIncrement",
-          "variableType" : "Boolean",
-          "documentation" : "",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Whether the designated column is automatically numbered\n@param isAutoIncrement Whether the designated column is automatically numbered\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isAutoIncrement",
-          "variableType" : "Boolean",
-          "documentation" : "Whether the designated column is automatically numbered",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "isCaseSensitive",
-        "c2jShape" : "Boolean",
-        "deprecated" : false,
-        "documentation" : "Whether values in the designated column's case matters",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**Whether values in the designated column's case matters\n@param isCaseSensitive Whether values in the designated column's case matters\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withIsCaseSensitive",
-        "getterDocumentation" : "/**Whether values in the designated column's case matters\n@return Whether values in the designated column's case matters*/",
-        "getterMethodName" : "getIsCaseSensitive",
-        "getterModel" : {
-          "returnType" : "Boolean",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "isCaseSensitive",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "isCaseSensitive",
-          "uri" : false
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "SqlParametersList",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "java.util.List<SqlParameter>",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : true,
+            "listModel" : {
+              "implType" : "java.util.ArrayList",
+              "interfaceType" : "java.util.List",
+              "listMemberModel" : {
+                "c2jName" : "member",
+                "c2jShape" : "SqlParameter",
+                "deprecated" : false,
+                "documentation" : "",
+                "enumType" : null,
+                "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                "fluentSetterMethodName" : "withMember",
+                "getterDocumentation" : "/**\n@return */",
+                "getterMethodName" : "getMember",
+                "getterModel" : {
+                  "returnType" : "SqlParameter",
+                  "documentation" : null
+                },
+                "http" : {
+                  "additionalMarshallingPath" : null,
+                  "additionalUnmarshallingPath" : null,
+                  "flattened" : false,
+                  "greedy" : false,
+                  "header" : false,
+                  "isPayload" : false,
+                  "isStreaming" : false,
+                  "location" : null,
+                  "marshallLocation" : "PAYLOAD",
+                  "marshallLocationName" : "member",
+                  "queryString" : false,
+                  "requiresLength" : false,
+                  "statusCode" : false,
+                  "unmarshallLocationName" : "member",
+                  "uri" : false
+                },
+                "idempotencyToken" : false,
+                "isBinary" : false,
+                "jsonValue" : false,
+                "list" : false,
+                "listModel" : null,
+                "map" : false,
+                "mapModel" : null,
+                "marshallingTargetClass" : "StructuredPojo",
+                "marshallingType" : "STRUCTURED",
+                "name" : "Member",
+                "sensitive" : false,
+                "setterDocumentation" : "/**\n@param member */",
+                "setterMethodName" : "setMember",
+                "setterModel" : {
+                  "timestampFormat" : null,
+                  "variableDeclarationType" : "SqlParameter",
+                  "variableName" : "member",
+                  "variableType" : "SqlParameter",
+                  "documentation" : "",
+                  "simpleType" : "SqlParameter",
+                  "variableSetterType" : "SqlParameter"
+                },
+                "shouldEmitLegacyEnumSetter" : false,
+                "simple" : false,
+                "unmarshallingType" : null,
+                "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                "variable" : {
+                  "timestampFormat" : null,
+                  "variableDeclarationType" : "SqlParameter",
+                  "variableName" : "member",
+                  "variableType" : "SqlParameter",
+                  "documentation" : "",
+                  "simpleType" : "SqlParameter",
+                  "variableSetterType" : "SqlParameter"
+                },
+                "xmlNameSpaceUri" : null
+              },
+              "memberLocationName" : null,
+              "memberType" : "SqlParameter",
+              "map" : false,
+              "marshallNonAutoConstructedEmptyLists" : false,
+              "memberAdditionalMarshallingPath" : null,
+              "memberAdditionalUnmarshallingPath" : null,
+              "sendEmptyQueryString" : false,
+              "simple" : false,
+              "simpleType" : "SqlParameter",
+              "templateImplType" : "java.util.ArrayList<SqlParameter>",
+              "templateType" : "java.util.List<SqlParameter>"
+            },
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "List",
+            "marshallingType" : "LIST",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "java.util.List<SqlParameter>",
+              "variableName" : "member",
+              "variableType" : "java.util.List<SqlParameter>",
+              "documentation" : "",
+              "simpleType" : "List<SqlParameter>",
+              "variableSetterType" : "java.util.Collection<SqlParameter>"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setMember(java.util.Collection)} or {@link #withMember(java.util.Collection)} if you want to override the existing values.</p>\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "java.util.List<SqlParameter>",
+              "variableName" : "member",
+              "variableType" : "java.util.List<SqlParameter>",
+              "documentation" : "",
+              "simpleType" : "List<SqlParameter>",
+              "variableSetterType" : "java.util.Collection<SqlParameter>"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "java.util.List<SqlParameter>",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "List<SqlParameter>",
+          "templateImplType" : "java.util.ArrayList<java.util.List<SqlParameter>>",
+          "templateType" : "java.util.List<java.util.List<SqlParameter>>"
         },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Boolean",
-        "marshallingType" : "BOOLEAN",
-        "name" : "IsCaseSensitive",
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "ParameterSets",
         "sensitive" : false,
-        "setterDocumentation" : "/**Whether values in the designated column's case matters\n@param isCaseSensitive Whether values in the designated column's case matters*/",
-        "setterMethodName" : "setIsCaseSensitive",
+        "setterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n@param parameterSets The parameter set for the batch operation.*/",
+        "setterMethodName" : "setParameterSets",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isCaseSensitive",
-          "variableType" : "Boolean",
+          "variableDeclarationType" : "java.util.List<java.util.List<SqlParameter>>",
+          "variableName" : "parameterSets",
+          "variableType" : "java.util.List<java.util.List<SqlParameter>>",
           "documentation" : "",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
+          "simpleType" : "List<SqlParameter>>",
+          "variableSetterType" : "java.util.Collection<java.util.List<SqlParameter>>"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Whether values in the designated column's case matters\n@param isCaseSensitive Whether values in the designated column's case matters\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setParameterSets(java.util.Collection)} or {@link #withParameterSets(java.util.Collection)} if you want to override the existing values.</p>\n@param parameterSets The parameter set for the batch operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isCaseSensitive",
-          "variableType" : "Boolean",
-          "documentation" : "Whether values in the designated column's case matters",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
+          "variableDeclarationType" : "java.util.List<java.util.List<SqlParameter>>",
+          "variableName" : "parameterSets",
+          "variableType" : "java.util.List<java.util.List<SqlParameter>>",
+          "documentation" : "<p>The parameter set for the batch operation.</p>",
+          "simpleType" : "List<SqlParameter>>",
+          "variableSetterType" : "java.util.Collection<java.util.List<SqlParameter>>"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "isCurrency",
-        "c2jShape" : "Boolean",
+        "c2jName" : "resourceArn",
+        "c2jShape" : "Arn",
         "deprecated" : false,
-        "documentation" : "Whether values in the designated column is a cash value",
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Whether values in the designated column is a cash value\n@param isCurrency Whether values in the designated column is a cash value\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withIsCurrency",
-        "getterDocumentation" : "/**Whether values in the designated column is a cash value\n@return Whether values in the designated column is a cash value*/",
-        "getterMethodName" : "getIsCurrency",
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "getterMethodName" : "getResourceArn",
         "getterModel" : {
-          "returnType" : "Boolean",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -415,11 +779,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "isCurrency",
+          "marshallLocationName" : "resourceArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "isCurrency",
+          "unmarshallLocationName" : "resourceArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -429,47 +793,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Boolean",
-        "marshallingType" : "BOOLEAN",
-        "name" : "IsCurrency",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**Whether values in the designated column is a cash value\n@param isCurrency Whether values in the designated column is a cash value*/",
-        "setterMethodName" : "setIsCurrency",
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "setterMethodName" : "setResourceArn",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isCurrency",
-          "variableType" : "Boolean",
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Whether values in the designated column is a cash value\n@param isCurrency Whether values in the designated column is a cash value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isCurrency",
-          "variableType" : "Boolean",
-          "documentation" : "Whether values in the designated column is a cash value",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "isSigned",
-        "c2jShape" : "Boolean",
+        "c2jName" : "schema",
+        "c2jShape" : "DbName",
         "deprecated" : false,
-        "documentation" : "Whether values in the designated column are signed numbers",
+        "documentation" : "<p>The name of the database schema.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Whether values in the designated column are signed numbers\n@param isSigned Whether values in the designated column are signed numbers\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withIsSigned",
-        "getterDocumentation" : "/**Whether values in the designated column are signed numbers\n@return Whether values in the designated column are signed numbers*/",
-        "getterMethodName" : "getIsSigned",
+        "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSchema",
+        "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+        "getterMethodName" : "getSchema",
         "getterModel" : {
-          "returnType" : "Boolean",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -482,11 +846,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "isSigned",
+          "marshallLocationName" : "schema",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "isSigned",
+          "unmarshallLocationName" : "schema",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -496,45 +860,45 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Boolean",
-        "marshallingType" : "BOOLEAN",
-        "name" : "IsSigned",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Schema",
         "sensitive" : false,
-        "setterDocumentation" : "/**Whether values in the designated column are signed numbers\n@param isSigned Whether values in the designated column are signed numbers*/",
-        "setterMethodName" : "setIsSigned",
+        "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+        "setterMethodName" : "setSchema",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isSigned",
-          "variableType" : "Boolean",
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Whether values in the designated column are signed numbers\n@param isSigned Whether values in the designated column are signed numbers\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Boolean",
-          "variableName" : "isSigned",
-          "variableType" : "Boolean",
-          "documentation" : "Whether values in the designated column are signed numbers",
-          "simpleType" : "Boolean",
-          "variableSetterType" : "Boolean"
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database schema.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "label",
-        "c2jShape" : "String",
+        "c2jName" : "secretArn",
+        "c2jShape" : "Arn",
         "deprecated" : false,
-        "documentation" : "Usually specified by the SQL AS. If not specified, return column name.",
+        "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@param label Usually specified by the SQL AS. If not specified, return column name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withLabel",
-        "getterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@return Usually specified by the SQL AS. If not specified, return column name.*/",
-        "getterMethodName" : "getLabel",
+        "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSecretArn",
+        "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+        "getterMethodName" : "getSecretArn",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -549,11 +913,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "label",
+          "marshallLocationName" : "secretArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "label",
+          "unmarshallLocationName" : "secretArn",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -565,14 +929,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Label",
+        "name" : "SecretArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@param label Usually specified by the SQL AS. If not specified, return column name.*/",
-        "setterMethodName" : "setLabel",
+        "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+        "setterMethodName" : "setSecretArn",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "label",
+          "variableName" : "secretArn",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -581,27 +945,27 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@param label Usually specified by the SQL AS. If not specified, return column name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "label",
+          "variableName" : "secretArn",
           "variableType" : "String",
-          "documentation" : "Usually specified by the SQL AS. If not specified, return column name.",
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "name",
-        "c2jShape" : "String",
+        "c2jName" : "sql",
+        "c2jShape" : "SqlStatement",
         "deprecated" : false,
-        "documentation" : "Name of the column.",
+        "documentation" : "<p>The SQL statement to run.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Name of the column.\n@param name Name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withName",
-        "getterDocumentation" : "/**Name of the column.\n@return Name of the column.*/",
-        "getterMethodName" : "getName",
+        "fluentSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSql",
+        "getterDocumentation" : "/**<p>The SQL statement to run.</p>\n@return The SQL statement to run.*/",
+        "getterMethodName" : "getSql",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -616,11 +980,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "name",
+          "marshallLocationName" : "sql",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "name",
+          "unmarshallLocationName" : "sql",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -632,14 +996,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "Name",
+        "name" : "Sql",
         "sensitive" : false,
-        "setterDocumentation" : "/**Name of the column.\n@param name Name of the column.*/",
-        "setterMethodName" : "setName",
+        "setterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.*/",
+        "setterMethodName" : "setSql",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "name",
+          "variableName" : "sql",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -648,29 +1012,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Name of the column.\n@param name Name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "name",
+          "variableName" : "sql",
           "variableType" : "String",
-          "documentation" : "Name of the column.",
+          "documentation" : "<p>The SQL statement to run.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "nullable",
-        "c2jShape" : "Integer",
+        "c2jName" : "transactionId",
+        "c2jShape" : "Id",
         "deprecated" : false,
-        "documentation" : "Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)",
+        "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@param nullable Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNullable",
-        "getterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@return Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)*/",
-        "getterMethodName" : "getNullable",
+        "fluentSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionId",
+        "getterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@return The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.*/",
+        "getterMethodName" : "getTransactionId",
         "getterModel" : {
-          "returnType" : "Integer",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -683,11 +1047,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "nullable",
+          "marshallLocationName" : "transactionId",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "nullable",
+          "unmarshallLocationName" : "transactionId",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -697,115 +1061,727 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "Nullable",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionId",
         "sensitive" : false,
-        "setterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@param nullable Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)*/",
-        "setterMethodName" : "setNullable",
+        "setterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.*/",
+        "setterMethodName" : "setTransactionId",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "nullable",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@param nullable Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "nullable",
-          "variableType" : "Integer",
-          "documentation" : "Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "precision",
-        "c2jShape" : "Integer",
-        "deprecated" : false,
-        "documentation" : "Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@param precision Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withPrecision",
-        "getterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@return Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.*/",
-        "getterMethodName" : "getPrecision",
-        "getterModel" : {
-          "returnType" : "Integer",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "precision",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "precision",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "Precision",
-        "sensitive" : false,
-        "setterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@param precision Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.*/",
-        "setterMethodName" : "setPrecision",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "precision",
-          "variableType" : "Integer",
-          "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+      } ],
+      "membersAsMap" : {
+        "Database" : {
+          "c2jName" : "database",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatabase",
+          "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+          "getterMethodName" : "getDatabase",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "database",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "database",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Database",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+          "setterMethodName" : "setDatabase",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@param precision Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "precision",
-          "variableType" : "Integer",
-          "documentation" : "Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+        "ParameterSets" : {
+          "c2jName" : "parameterSets",
+          "c2jShape" : "SqlParameterSets",
+          "deprecated" : false,
+          "documentation" : "<p>The parameter set for the batch operation.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n@param parameterSets The parameter set for the batch operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withParameterSets",
+          "getterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n@return The parameter set for the batch operation.*/",
+          "getterMethodName" : "getParameterSets",
+          "getterModel" : {
+            "returnType" : "java.util.List<java.util.List<SqlParameter>>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "parameterSets",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "parameterSets",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "SqlParametersList",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "java.util.List<SqlParameter>",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : true,
+              "listModel" : {
+                "implType" : "java.util.ArrayList",
+                "interfaceType" : "java.util.List",
+                "listMemberModel" : {
+                  "c2jName" : "member",
+                  "c2jShape" : "SqlParameter",
+                  "deprecated" : false,
+                  "documentation" : "",
+                  "enumType" : null,
+                  "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                  "fluentSetterMethodName" : "withMember",
+                  "getterDocumentation" : "/**\n@return */",
+                  "getterMethodName" : "getMember",
+                  "getterModel" : {
+                    "returnType" : "SqlParameter",
+                    "documentation" : null
+                  },
+                  "http" : {
+                    "additionalMarshallingPath" : null,
+                    "additionalUnmarshallingPath" : null,
+                    "flattened" : false,
+                    "greedy" : false,
+                    "header" : false,
+                    "isPayload" : false,
+                    "isStreaming" : false,
+                    "location" : null,
+                    "marshallLocation" : "PAYLOAD",
+                    "marshallLocationName" : "member",
+                    "queryString" : false,
+                    "requiresLength" : false,
+                    "statusCode" : false,
+                    "unmarshallLocationName" : "member",
+                    "uri" : false
+                  },
+                  "idempotencyToken" : false,
+                  "isBinary" : false,
+                  "jsonValue" : false,
+                  "list" : false,
+                  "listModel" : null,
+                  "map" : false,
+                  "mapModel" : null,
+                  "marshallingTargetClass" : "StructuredPojo",
+                  "marshallingType" : "STRUCTURED",
+                  "name" : "Member",
+                  "sensitive" : false,
+                  "setterDocumentation" : "/**\n@param member */",
+                  "setterMethodName" : "setMember",
+                  "setterModel" : {
+                    "timestampFormat" : null,
+                    "variableDeclarationType" : "SqlParameter",
+                    "variableName" : "member",
+                    "variableType" : "SqlParameter",
+                    "documentation" : "",
+                    "simpleType" : "SqlParameter",
+                    "variableSetterType" : "SqlParameter"
+                  },
+                  "shouldEmitLegacyEnumSetter" : false,
+                  "simple" : false,
+                  "unmarshallingType" : null,
+                  "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                  "variable" : {
+                    "timestampFormat" : null,
+                    "variableDeclarationType" : "SqlParameter",
+                    "variableName" : "member",
+                    "variableType" : "SqlParameter",
+                    "documentation" : "",
+                    "simpleType" : "SqlParameter",
+                    "variableSetterType" : "SqlParameter"
+                  },
+                  "xmlNameSpaceUri" : null
+                },
+                "memberLocationName" : null,
+                "memberType" : "SqlParameter",
+                "map" : false,
+                "marshallNonAutoConstructedEmptyLists" : false,
+                "memberAdditionalMarshallingPath" : null,
+                "memberAdditionalUnmarshallingPath" : null,
+                "sendEmptyQueryString" : false,
+                "simple" : false,
+                "simpleType" : "SqlParameter",
+                "templateImplType" : "java.util.ArrayList<SqlParameter>",
+                "templateType" : "java.util.List<SqlParameter>"
+              },
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "List",
+              "marshallingType" : "LIST",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "java.util.List<SqlParameter>",
+                "variableName" : "member",
+                "variableType" : "java.util.List<SqlParameter>",
+                "documentation" : "",
+                "simpleType" : "List<SqlParameter>",
+                "variableSetterType" : "java.util.Collection<SqlParameter>"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setMember(java.util.Collection)} or {@link #withMember(java.util.Collection)} if you want to override the existing values.</p>\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "java.util.List<SqlParameter>",
+                "variableName" : "member",
+                "variableType" : "java.util.List<SqlParameter>",
+                "documentation" : "",
+                "simpleType" : "List<SqlParameter>",
+                "variableSetterType" : "java.util.Collection<SqlParameter>"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "java.util.List<SqlParameter>",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "List<SqlParameter>",
+            "templateImplType" : "java.util.ArrayList<java.util.List<SqlParameter>>",
+            "templateType" : "java.util.List<java.util.List<SqlParameter>>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "ParameterSets",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n@param parameterSets The parameter set for the batch operation.*/",
+          "setterMethodName" : "setParameterSets",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<java.util.List<SqlParameter>>",
+            "variableName" : "parameterSets",
+            "variableType" : "java.util.List<java.util.List<SqlParameter>>",
+            "documentation" : "",
+            "simpleType" : "List<SqlParameter>>",
+            "variableSetterType" : "java.util.Collection<java.util.List<SqlParameter>>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The parameter set for the batch operation.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setParameterSets(java.util.Collection)} or {@link #withParameterSets(java.util.Collection)} if you want to override the existing values.</p>\n@param parameterSets The parameter set for the batch operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<java.util.List<SqlParameter>>",
+            "variableName" : "parameterSets",
+            "variableType" : "java.util.List<java.util.List<SqlParameter>>",
+            "documentation" : "<p>The parameter set for the batch operation.</p>",
+            "simpleType" : "List<SqlParameter>>",
+            "variableSetterType" : "java.util.Collection<java.util.List<SqlParameter>>"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "scale",
-        "c2jShape" : "Integer",
-        "deprecated" : false,
-        "documentation" : "Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@param scale Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withScale",
-        "getterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@return Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.*/",
-        "getterMethodName" : "getScale",
-        "getterModel" : {
-          "returnType" : "Integer",
-          "documentation" : null
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Schema" : {
+          "c2jName" : "schema",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database schema.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSchema",
+          "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+          "getterMethodName" : "getSchema",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "schema",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "schema",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Schema",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+          "setterMethodName" : "setSchema",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database schema.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SecretArn" : {
+          "c2jName" : "secretArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSecretArn",
+          "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+          "getterMethodName" : "getSecretArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "secretArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "secretArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SecretArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+          "setterMethodName" : "setSecretArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Sql" : {
+          "c2jName" : "sql",
+          "c2jShape" : "SqlStatement",
+          "deprecated" : false,
+          "documentation" : "<p>The SQL statement to run.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSql",
+          "getterDocumentation" : "/**<p>The SQL statement to run.</p>\n@return The SQL statement to run.*/",
+          "getterMethodName" : "getSql",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sql",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sql",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Sql",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.*/",
+          "setterMethodName" : "setSql",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sql",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sql",
+            "variableType" : "String",
+            "documentation" : "<p>The SQL statement to run.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TransactionId" : {
+          "c2jName" : "transactionId",
+          "c2jShape" : "Id",
+          "deprecated" : false,
+          "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionId",
+          "getterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@return The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.*/",
+          "getterMethodName" : "getTransactionId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.*/",
+          "setterMethodName" : "setTransactionId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "secretArn", "sql" ],
+      "shapeName" : "BatchExecuteStatementRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchExecuteStatementRequest",
+        "variableName" : "batchExecuteStatementRequest",
+        "variableType" : "BatchExecuteStatementRequest",
+        "documentation" : null,
+        "simpleType" : "BatchExecuteStatementRequest",
+        "variableSetterType" : "BatchExecuteStatementRequest"
+      },
+      "wrapper" : false
+    },
+    "BatchExecuteStatementResult" : {
+      "c2jName" : "BatchExecuteStatementResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The response elements represent the output of a SQL statement over an array of\n            data.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "updateResults",
+        "c2jShape" : "UpdateResults",
+        "deprecated" : false,
+        "documentation" : "<p>The execution results of each batch entry.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n@param updateResults The execution results of each batch entry.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withUpdateResults",
+        "getterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n@return The execution results of each batch entry.*/",
+        "getterMethodName" : "getUpdateResults",
+        "getterModel" : {
+          "returnType" : "java.util.List<UpdateResult>",
+          "documentation" : null
         },
         "http" : {
           "additionalMarshallingPath" : null,
@@ -817,61 +1793,7383 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "scale",
+          "marshallLocationName" : "updateResults",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "scale",
+          "unmarshallLocationName" : "updateResults",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "Scale",
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "UpdateResult",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "UpdateResult",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "UpdateResult",
+              "variableName" : "member",
+              "variableType" : "UpdateResult",
+              "documentation" : "",
+              "simpleType" : "UpdateResult",
+              "variableSetterType" : "UpdateResult"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "UpdateResult",
+              "variableName" : "member",
+              "variableType" : "UpdateResult",
+              "documentation" : "",
+              "simpleType" : "UpdateResult",
+              "variableSetterType" : "UpdateResult"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "UpdateResult",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "UpdateResult",
+          "templateImplType" : "java.util.ArrayList<UpdateResult>",
+          "templateType" : "java.util.List<UpdateResult>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "UpdateResults",
         "sensitive" : false,
-        "setterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@param scale Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.*/",
-        "setterMethodName" : "setScale",
+        "setterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n@param updateResults The execution results of each batch entry.*/",
+        "setterMethodName" : "setUpdateResults",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "scale",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "java.util.List<UpdateResult>",
+          "variableName" : "updateResults",
+          "variableType" : "java.util.List<UpdateResult>",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "List<UpdateResult>",
+          "variableSetterType" : "java.util.Collection<UpdateResult>"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@param scale Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setUpdateResults(java.util.Collection)} or {@link #withUpdateResults(java.util.Collection)} if you want to override the existing values.</p>\n@param updateResults The execution results of each batch entry.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "scale",
-          "variableType" : "Integer",
-          "documentation" : "Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "java.util.List<UpdateResult>",
+          "variableName" : "updateResults",
+          "variableType" : "java.util.List<UpdateResult>",
+          "documentation" : "<p>The execution results of each batch entry.</p>",
+          "simpleType" : "List<UpdateResult>",
+          "variableSetterType" : "java.util.Collection<UpdateResult>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "UpdateResults" : {
+          "c2jName" : "updateResults",
+          "c2jShape" : "UpdateResults",
+          "deprecated" : false,
+          "documentation" : "<p>The execution results of each batch entry.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n@param updateResults The execution results of each batch entry.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withUpdateResults",
+          "getterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n@return The execution results of each batch entry.*/",
+          "getterMethodName" : "getUpdateResults",
+          "getterModel" : {
+            "returnType" : "java.util.List<UpdateResult>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "updateResults",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "updateResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "UpdateResult",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "UpdateResult",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "UpdateResult",
+                "variableName" : "member",
+                "variableType" : "UpdateResult",
+                "documentation" : "",
+                "simpleType" : "UpdateResult",
+                "variableSetterType" : "UpdateResult"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "UpdateResult",
+                "variableName" : "member",
+                "variableType" : "UpdateResult",
+                "documentation" : "",
+                "simpleType" : "UpdateResult",
+                "variableSetterType" : "UpdateResult"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "UpdateResult",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "UpdateResult",
+            "templateImplType" : "java.util.ArrayList<UpdateResult>",
+            "templateType" : "java.util.List<UpdateResult>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "UpdateResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n@param updateResults The execution results of each batch entry.*/",
+          "setterMethodName" : "setUpdateResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<UpdateResult>",
+            "variableName" : "updateResults",
+            "variableType" : "java.util.List<UpdateResult>",
+            "documentation" : "",
+            "simpleType" : "List<UpdateResult>",
+            "variableSetterType" : "java.util.Collection<UpdateResult>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The execution results of each batch entry.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setUpdateResults(java.util.Collection)} or {@link #withUpdateResults(java.util.Collection)} if you want to override the existing values.</p>\n@param updateResults The execution results of each batch entry.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<UpdateResult>",
+            "variableName" : "updateResults",
+            "variableType" : "java.util.List<UpdateResult>",
+            "documentation" : "<p>The execution results of each batch entry.</p>",
+            "simpleType" : "List<UpdateResult>",
+            "variableSetterType" : "java.util.Collection<UpdateResult>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BatchExecuteStatementResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BatchExecuteStatementResult",
+        "variableName" : "batchExecuteStatementResult",
+        "variableType" : "BatchExecuteStatementResult",
+        "documentation" : null,
+        "simpleType" : "BatchExecuteStatementResult",
+        "variableSetterType" : "BatchExecuteStatementResult"
+      },
+      "wrapper" : false
+    },
+    "BeginTransactionRequest" : {
+      "c2jName" : "BeginTransactionRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request parameters represent the input of a request to start a SQL\n            transaction.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "BeginTransaction",
+        "locationName" : null,
+        "requestUri" : "/BeginTransaction",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "database",
+        "c2jShape" : "DbName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the database.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatabase",
+        "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+        "getterMethodName" : "getDatabase",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "database",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "database",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Database",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+        "setterMethodName" : "setDatabase",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "schema",
+        "c2jShape" : "DbName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the database schema.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSchema",
+        "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+        "getterMethodName" : "getSchema",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "schema",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "schema",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Schema",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+        "setterMethodName" : "setSchema",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database schema.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "secretArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSecretArn",
+        "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+        "getterMethodName" : "getSecretArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "secretArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "secretArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "SecretArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+        "setterMethodName" : "setSecretArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Database" : {
+          "c2jName" : "database",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatabase",
+          "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+          "getterMethodName" : "getDatabase",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "database",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "database",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Database",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+          "setterMethodName" : "setDatabase",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Schema" : {
+          "c2jName" : "schema",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database schema.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSchema",
+          "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+          "getterMethodName" : "getSchema",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "schema",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "schema",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Schema",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+          "setterMethodName" : "setSchema",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database schema.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SecretArn" : {
+          "c2jName" : "secretArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSecretArn",
+          "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+          "getterMethodName" : "getSecretArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "secretArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "secretArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SecretArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+          "setterMethodName" : "setSecretArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "secretArn" ],
+      "shapeName" : "BeginTransactionRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BeginTransactionRequest",
+        "variableName" : "beginTransactionRequest",
+        "variableType" : "BeginTransactionRequest",
+        "documentation" : null,
+        "simpleType" : "BeginTransactionRequest",
+        "variableSetterType" : "BeginTransactionRequest"
+      },
+      "wrapper" : false
+    },
+    "BeginTransactionResult" : {
+      "c2jName" : "BeginTransactionResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The response elements represent the output of a request to start a SQL\n            transaction.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "transactionId",
+        "c2jShape" : "Id",
+        "deprecated" : false,
+        "documentation" : "<p>The transaction ID of the transaction started by the call.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@param transactionId The transaction ID of the transaction started by the call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionId",
+        "getterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@return The transaction ID of the transaction started by the call.*/",
+        "getterMethodName" : "getTransactionId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "transactionId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "transactionId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@param transactionId The transaction ID of the transaction started by the call.*/",
+        "setterMethodName" : "setTransactionId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@param transactionId The transaction ID of the transaction started by the call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "<p>The transaction ID of the transaction started by the call.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "TransactionId" : {
+          "c2jName" : "transactionId",
+          "c2jShape" : "Id",
+          "deprecated" : false,
+          "documentation" : "<p>The transaction ID of the transaction started by the call.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@param transactionId The transaction ID of the transaction started by the call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionId",
+          "getterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@return The transaction ID of the transaction started by the call.*/",
+          "getterMethodName" : "getTransactionId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@param transactionId The transaction ID of the transaction started by the call.*/",
+          "setterMethodName" : "setTransactionId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The transaction ID of the transaction started by the call.</p>\n@param transactionId The transaction ID of the transaction started by the call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "<p>The transaction ID of the transaction started by the call.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "BeginTransactionResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "BeginTransactionResult",
+        "variableName" : "beginTransactionResult",
+        "variableType" : "BeginTransactionResult",
+        "documentation" : null,
+        "simpleType" : "BeginTransactionResult",
+        "variableSetterType" : "BeginTransactionResult"
+      },
+      "wrapper" : false
+    },
+    "ColumnMetadata" : {
+      "c2jName" : "ColumnMetadata",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Contains the metadata for a column.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "arrayBaseColumnType",
+        "c2jShape" : "Integer",
+        "deprecated" : false,
+        "documentation" : "<p>The type of the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The type of the column.</p>\n@param arrayBaseColumnType The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withArrayBaseColumnType",
+        "getterDocumentation" : "/**<p>The type of the column.</p>\n@return The type of the column.*/",
+        "getterMethodName" : "getArrayBaseColumnType",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "arrayBaseColumnType",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "arrayBaseColumnType",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "ArrayBaseColumnType",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The type of the column.</p>\n@param arrayBaseColumnType The type of the column.*/",
+        "setterMethodName" : "setArrayBaseColumnType",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "arrayBaseColumnType",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The type of the column.</p>\n@param arrayBaseColumnType The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "arrayBaseColumnType",
+          "variableType" : "Integer",
+          "documentation" : "<p>The type of the column.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "isAutoIncrement",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether the column increments automatically.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@param isAutoIncrement A value that indicates whether the column increments automatically.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIsAutoIncrement",
+        "getterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@return A value that indicates whether the column increments automatically.*/",
+        "getterMethodName" : "getIsAutoIncrement",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "isAutoIncrement",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "isAutoIncrement",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "IsAutoIncrement",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@param isAutoIncrement A value that indicates whether the column increments automatically.*/",
+        "setterMethodName" : "setIsAutoIncrement",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isAutoIncrement",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@param isAutoIncrement A value that indicates whether the column increments automatically.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isAutoIncrement",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value that indicates whether the column increments automatically.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "isCaseSensitive",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether the column is case-sensitive.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@param isCaseSensitive A value that indicates whether the column is case-sensitive.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIsCaseSensitive",
+        "getterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@return A value that indicates whether the column is case-sensitive.*/",
+        "getterMethodName" : "getIsCaseSensitive",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "isCaseSensitive",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "isCaseSensitive",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "IsCaseSensitive",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@param isCaseSensitive A value that indicates whether the column is case-sensitive.*/",
+        "setterMethodName" : "setIsCaseSensitive",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isCaseSensitive",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@param isCaseSensitive A value that indicates whether the column is case-sensitive.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isCaseSensitive",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value that indicates whether the column is case-sensitive.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "isCurrency",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether the column contains currency values.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@param isCurrency A value that indicates whether the column contains currency values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIsCurrency",
+        "getterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@return A value that indicates whether the column contains currency values.*/",
+        "getterMethodName" : "getIsCurrency",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "isCurrency",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "isCurrency",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "IsCurrency",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@param isCurrency A value that indicates whether the column contains currency values.*/",
+        "setterMethodName" : "setIsCurrency",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isCurrency",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@param isCurrency A value that indicates whether the column contains currency values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isCurrency",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value that indicates whether the column contains currency values.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "isSigned",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether an integer column is signed.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@param isSigned A value that indicates whether an integer column is signed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIsSigned",
+        "getterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@return A value that indicates whether an integer column is signed.*/",
+        "getterMethodName" : "getIsSigned",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "isSigned",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "isSigned",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "IsSigned",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@param isSigned A value that indicates whether an integer column is signed.*/",
+        "setterMethodName" : "setIsSigned",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isSigned",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@param isSigned A value that indicates whether an integer column is signed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isSigned",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value that indicates whether an integer column is signed.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "label",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The label for the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The label for the column.</p>\n@param label The label for the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLabel",
+        "getterDocumentation" : "/**<p>The label for the column.</p>\n@return The label for the column.*/",
+        "getterMethodName" : "getLabel",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "label",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "label",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Label",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The label for the column.</p>\n@param label The label for the column.*/",
+        "setterMethodName" : "setLabel",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "label",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The label for the column.</p>\n@param label The label for the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "label",
+          "variableType" : "String",
+          "documentation" : "<p>The label for the column.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "name",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the column.</p>\n@param name The name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**<p>The name of the column.</p>\n@return The name of the column.*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the column.</p>\n@param name The name of the column.*/",
+        "setterMethodName" : "setName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the column.</p>\n@param name The name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the column.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "nullable",
+        "c2jShape" : "Integer",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether the column is nullable.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@param nullable A value that indicates whether the column is nullable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNullable",
+        "getterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@return A value that indicates whether the column is nullable.*/",
+        "getterMethodName" : "getNullable",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "nullable",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "nullable",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "Nullable",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@param nullable A value that indicates whether the column is nullable.*/",
+        "setterMethodName" : "setNullable",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "nullable",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@param nullable A value that indicates whether the column is nullable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "nullable",
+          "variableType" : "Integer",
+          "documentation" : "<p>A value that indicates whether the column is nullable.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "precision",
+        "c2jShape" : "Integer",
+        "deprecated" : false,
+        "documentation" : "<p>The precision value of a decimal number column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@param precision The precision value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPrecision",
+        "getterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@return The precision value of a decimal number column.*/",
+        "getterMethodName" : "getPrecision",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "precision",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "precision",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "Precision",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@param precision The precision value of a decimal number column.*/",
+        "setterMethodName" : "setPrecision",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "precision",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@param precision The precision value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "precision",
+          "variableType" : "Integer",
+          "documentation" : "<p>The precision value of a decimal number column.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "scale",
+        "c2jShape" : "Integer",
+        "deprecated" : false,
+        "documentation" : "<p>The scale value of a decimal number column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@param scale The scale value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withScale",
+        "getterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@return The scale value of a decimal number column.*/",
+        "getterMethodName" : "getScale",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "scale",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "scale",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "Scale",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@param scale The scale value of a decimal number column.*/",
+        "setterMethodName" : "setScale",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "scale",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@param scale The scale value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "scale",
+          "variableType" : "Integer",
+          "documentation" : "<p>The scale value of a decimal number column.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "schemaName",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the schema that owns the table that includes the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@param schemaName The name of the schema that owns the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSchemaName",
+        "getterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@return The name of the schema that owns the table that includes the column.*/",
+        "getterMethodName" : "getSchemaName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "schemaName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "schemaName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "SchemaName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@param schemaName The name of the schema that owns the table that includes the column.*/",
+        "setterMethodName" : "setSchemaName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schemaName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@param schemaName The name of the schema that owns the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schemaName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the schema that owns the table that includes the column.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "tableName",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the table that includes the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@param tableName The name of the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTableName",
+        "getterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@return The name of the table that includes the column.*/",
+        "getterMethodName" : "getTableName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "tableName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "tableName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TableName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@param tableName The name of the table that includes the column.*/",
+        "setterMethodName" : "setTableName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "tableName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@param tableName The name of the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "tableName",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the table that includes the column.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "type",
+        "c2jShape" : "Integer",
+        "deprecated" : false,
+        "documentation" : "<p>The type of the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The type of the column.</p>\n@param type The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withType",
+        "getterDocumentation" : "/**<p>The type of the column.</p>\n@return The type of the column.*/",
+        "getterMethodName" : "getType",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "type",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "type",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "Type",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The type of the column.</p>\n@param type The type of the column.*/",
+        "setterMethodName" : "setType",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "type",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The type of the column.</p>\n@param type The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "type",
+          "variableType" : "Integer",
+          "documentation" : "<p>The type of the column.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "typeName",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>The database-specific data type of the column.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@param typeName The database-specific data type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTypeName",
+        "getterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@return The database-specific data type of the column.*/",
+        "getterMethodName" : "getTypeName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "typeName",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "typeName",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TypeName",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@param typeName The database-specific data type of the column.*/",
+        "setterMethodName" : "setTypeName",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "typeName",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@param typeName The database-specific data type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "typeName",
+          "variableType" : "String",
+          "documentation" : "<p>The database-specific data type of the column.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ArrayBaseColumnType" : {
+          "c2jName" : "arrayBaseColumnType",
+          "c2jShape" : "Integer",
+          "deprecated" : false,
+          "documentation" : "<p>The type of the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The type of the column.</p>\n@param arrayBaseColumnType The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withArrayBaseColumnType",
+          "getterDocumentation" : "/**<p>The type of the column.</p>\n@return The type of the column.*/",
+          "getterMethodName" : "getArrayBaseColumnType",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "arrayBaseColumnType",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "arrayBaseColumnType",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "ArrayBaseColumnType",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The type of the column.</p>\n@param arrayBaseColumnType The type of the column.*/",
+          "setterMethodName" : "setArrayBaseColumnType",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "arrayBaseColumnType",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The type of the column.</p>\n@param arrayBaseColumnType The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "arrayBaseColumnType",
+            "variableType" : "Integer",
+            "documentation" : "<p>The type of the column.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "IsAutoIncrement" : {
+          "c2jName" : "isAutoIncrement",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether the column increments automatically.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@param isAutoIncrement A value that indicates whether the column increments automatically.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIsAutoIncrement",
+          "getterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@return A value that indicates whether the column increments automatically.*/",
+          "getterMethodName" : "getIsAutoIncrement",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "isAutoIncrement",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "isAutoIncrement",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "IsAutoIncrement",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@param isAutoIncrement A value that indicates whether the column increments automatically.*/",
+          "setterMethodName" : "setIsAutoIncrement",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isAutoIncrement",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether the column increments automatically.</p>\n@param isAutoIncrement A value that indicates whether the column increments automatically.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isAutoIncrement",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value that indicates whether the column increments automatically.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "IsCaseSensitive" : {
+          "c2jName" : "isCaseSensitive",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether the column is case-sensitive.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@param isCaseSensitive A value that indicates whether the column is case-sensitive.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIsCaseSensitive",
+          "getterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@return A value that indicates whether the column is case-sensitive.*/",
+          "getterMethodName" : "getIsCaseSensitive",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "isCaseSensitive",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "isCaseSensitive",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "IsCaseSensitive",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@param isCaseSensitive A value that indicates whether the column is case-sensitive.*/",
+          "setterMethodName" : "setIsCaseSensitive",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isCaseSensitive",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether the column is case-sensitive.</p>\n@param isCaseSensitive A value that indicates whether the column is case-sensitive.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isCaseSensitive",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value that indicates whether the column is case-sensitive.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "IsCurrency" : {
+          "c2jName" : "isCurrency",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether the column contains currency values.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@param isCurrency A value that indicates whether the column contains currency values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIsCurrency",
+          "getterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@return A value that indicates whether the column contains currency values.*/",
+          "getterMethodName" : "getIsCurrency",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "isCurrency",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "isCurrency",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "IsCurrency",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@param isCurrency A value that indicates whether the column contains currency values.*/",
+          "setterMethodName" : "setIsCurrency",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isCurrency",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether the column contains currency values.</p>\n@param isCurrency A value that indicates whether the column contains currency values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isCurrency",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value that indicates whether the column contains currency values.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "IsSigned" : {
+          "c2jName" : "isSigned",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether an integer column is signed.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@param isSigned A value that indicates whether an integer column is signed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIsSigned",
+          "getterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@return A value that indicates whether an integer column is signed.*/",
+          "getterMethodName" : "getIsSigned",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "isSigned",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "isSigned",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "IsSigned",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@param isSigned A value that indicates whether an integer column is signed.*/",
+          "setterMethodName" : "setIsSigned",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isSigned",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether an integer column is signed.</p>\n@param isSigned A value that indicates whether an integer column is signed.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isSigned",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value that indicates whether an integer column is signed.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Label" : {
+          "c2jName" : "label",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The label for the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The label for the column.</p>\n@param label The label for the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLabel",
+          "getterDocumentation" : "/**<p>The label for the column.</p>\n@return The label for the column.*/",
+          "getterMethodName" : "getLabel",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "label",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "label",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Label",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The label for the column.</p>\n@param label The label for the column.*/",
+          "setterMethodName" : "setLabel",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "label",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The label for the column.</p>\n@param label The label for the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "label",
+            "variableType" : "String",
+            "documentation" : "<p>The label for the column.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Name" : {
+          "c2jName" : "name",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the column.</p>\n@param name The name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**<p>The name of the column.</p>\n@return The name of the column.*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the column.</p>\n@param name The name of the column.*/",
+          "setterMethodName" : "setName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the column.</p>\n@param name The name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the column.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Nullable" : {
+          "c2jName" : "nullable",
+          "c2jShape" : "Integer",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether the column is nullable.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@param nullable A value that indicates whether the column is nullable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNullable",
+          "getterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@return A value that indicates whether the column is nullable.*/",
+          "getterMethodName" : "getNullable",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "nullable",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "nullable",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "Nullable",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@param nullable A value that indicates whether the column is nullable.*/",
+          "setterMethodName" : "setNullable",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "nullable",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether the column is nullable.</p>\n@param nullable A value that indicates whether the column is nullable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "nullable",
+            "variableType" : "Integer",
+            "documentation" : "<p>A value that indicates whether the column is nullable.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Precision" : {
+          "c2jName" : "precision",
+          "c2jShape" : "Integer",
+          "deprecated" : false,
+          "documentation" : "<p>The precision value of a decimal number column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@param precision The precision value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPrecision",
+          "getterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@return The precision value of a decimal number column.*/",
+          "getterMethodName" : "getPrecision",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "precision",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "precision",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "Precision",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@param precision The precision value of a decimal number column.*/",
+          "setterMethodName" : "setPrecision",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "precision",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The precision value of a decimal number column.</p>\n@param precision The precision value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "precision",
+            "variableType" : "Integer",
+            "documentation" : "<p>The precision value of a decimal number column.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Scale" : {
+          "c2jName" : "scale",
+          "c2jShape" : "Integer",
+          "deprecated" : false,
+          "documentation" : "<p>The scale value of a decimal number column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@param scale The scale value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withScale",
+          "getterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@return The scale value of a decimal number column.*/",
+          "getterMethodName" : "getScale",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "scale",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "scale",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "Scale",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@param scale The scale value of a decimal number column.*/",
+          "setterMethodName" : "setScale",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "scale",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The scale value of a decimal number column.</p>\n@param scale The scale value of a decimal number column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "scale",
+            "variableType" : "Integer",
+            "documentation" : "<p>The scale value of a decimal number column.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SchemaName" : {
+          "c2jName" : "schemaName",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the schema that owns the table that includes the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@param schemaName The name of the schema that owns the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSchemaName",
+          "getterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@return The name of the schema that owns the table that includes the column.*/",
+          "getterMethodName" : "getSchemaName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "schemaName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "schemaName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SchemaName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@param schemaName The name of the schema that owns the table that includes the column.*/",
+          "setterMethodName" : "setSchemaName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schemaName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the schema that owns the table that includes the column.</p>\n@param schemaName The name of the schema that owns the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schemaName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the schema that owns the table that includes the column.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TableName" : {
+          "c2jName" : "tableName",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the table that includes the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@param tableName The name of the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTableName",
+          "getterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@return The name of the table that includes the column.*/",
+          "getterMethodName" : "getTableName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "tableName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "tableName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TableName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@param tableName The name of the table that includes the column.*/",
+          "setterMethodName" : "setTableName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tableName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the table that includes the column.</p>\n@param tableName The name of the table that includes the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tableName",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the table that includes the column.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Type" : {
+          "c2jName" : "type",
+          "c2jShape" : "Integer",
+          "deprecated" : false,
+          "documentation" : "<p>The type of the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The type of the column.</p>\n@param type The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withType",
+          "getterDocumentation" : "/**<p>The type of the column.</p>\n@return The type of the column.*/",
+          "getterMethodName" : "getType",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "type",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "type",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "Type",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The type of the column.</p>\n@param type The type of the column.*/",
+          "setterMethodName" : "setType",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "type",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The type of the column.</p>\n@param type The type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "type",
+            "variableType" : "Integer",
+            "documentation" : "<p>The type of the column.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TypeName" : {
+          "c2jName" : "typeName",
+          "c2jShape" : "String",
+          "deprecated" : false,
+          "documentation" : "<p>The database-specific data type of the column.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@param typeName The database-specific data type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTypeName",
+          "getterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@return The database-specific data type of the column.*/",
+          "getterMethodName" : "getTypeName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "typeName",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "typeName",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TypeName",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@param typeName The database-specific data type of the column.*/",
+          "setterMethodName" : "setTypeName",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "typeName",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The database-specific data type of the column.</p>\n@param typeName The database-specific data type of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "typeName",
+            "variableType" : "String",
+            "documentation" : "<p>The database-specific data type of the column.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ColumnMetadata",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ColumnMetadata",
+        "variableName" : "columnMetadata",
+        "variableType" : "ColumnMetadata",
+        "documentation" : null,
+        "simpleType" : "ColumnMetadata",
+        "variableSetterType" : "ColumnMetadata"
+      },
+      "wrapper" : false
+    },
+    "CommitTransactionRequest" : {
+      "c2jName" : "CommitTransactionRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request parameters represent the input of a commit transaction request.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "CommitTransaction",
+        "locationName" : null,
+        "requestUri" : "/CommitTransaction",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "secretArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSecretArn",
+        "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+        "getterMethodName" : "getSecretArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "secretArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "secretArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "SecretArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+        "setterMethodName" : "setSecretArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "transactionId",
+        "c2jShape" : "Id",
+        "deprecated" : false,
+        "documentation" : "<p>The identifier of the transaction to end and commit.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@param transactionId The identifier of the transaction to end and commit.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionId",
+        "getterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@return The identifier of the transaction to end and commit.*/",
+        "getterMethodName" : "getTransactionId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "transactionId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "transactionId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@param transactionId The identifier of the transaction to end and commit.*/",
+        "setterMethodName" : "setTransactionId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@param transactionId The identifier of the transaction to end and commit.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "<p>The identifier of the transaction to end and commit.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SecretArn" : {
+          "c2jName" : "secretArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSecretArn",
+          "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+          "getterMethodName" : "getSecretArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "secretArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "secretArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SecretArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+          "setterMethodName" : "setSecretArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TransactionId" : {
+          "c2jName" : "transactionId",
+          "c2jShape" : "Id",
+          "deprecated" : false,
+          "documentation" : "<p>The identifier of the transaction to end and commit.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@param transactionId The identifier of the transaction to end and commit.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionId",
+          "getterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@return The identifier of the transaction to end and commit.*/",
+          "getterMethodName" : "getTransactionId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@param transactionId The identifier of the transaction to end and commit.*/",
+          "setterMethodName" : "setTransactionId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The identifier of the transaction to end and commit.</p>\n@param transactionId The identifier of the transaction to end and commit.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "<p>The identifier of the transaction to end and commit.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "secretArn", "transactionId" ],
+      "shapeName" : "CommitTransactionRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CommitTransactionRequest",
+        "variableName" : "commitTransactionRequest",
+        "variableType" : "CommitTransactionRequest",
+        "documentation" : null,
+        "simpleType" : "CommitTransactionRequest",
+        "variableSetterType" : "CommitTransactionRequest"
+      },
+      "wrapper" : false
+    },
+    "CommitTransactionResult" : {
+      "c2jName" : "CommitTransactionResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The response elements represent the output of a commit transaction request.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "transactionStatus",
+        "c2jShape" : "TransactionStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the commit operation.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The status of the commit operation.</p>\n@param transactionStatus The status of the commit operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionStatus",
+        "getterDocumentation" : "/**<p>The status of the commit operation.</p>\n@return The status of the commit operation.*/",
+        "getterMethodName" : "getTransactionStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "transactionStatus",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "transactionStatus",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionStatus",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the commit operation.</p>\n@param transactionStatus The status of the commit operation.*/",
+        "setterMethodName" : "setTransactionStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionStatus",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the commit operation.</p>\n@param transactionStatus The status of the commit operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionStatus",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the commit operation.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "TransactionStatus" : {
+          "c2jName" : "transactionStatus",
+          "c2jShape" : "TransactionStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the commit operation.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The status of the commit operation.</p>\n@param transactionStatus The status of the commit operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionStatus",
+          "getterDocumentation" : "/**<p>The status of the commit operation.</p>\n@return The status of the commit operation.*/",
+          "getterMethodName" : "getTransactionStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionStatus",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionStatus",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionStatus",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the commit operation.</p>\n@param transactionStatus The status of the commit operation.*/",
+          "setterMethodName" : "setTransactionStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionStatus",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the commit operation.</p>\n@param transactionStatus The status of the commit operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionStatus",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the commit operation.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "CommitTransactionResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "CommitTransactionResult",
+        "variableName" : "commitTransactionResult",
+        "variableType" : "CommitTransactionResult",
+        "documentation" : null,
+        "simpleType" : "CommitTransactionResult",
+        "variableSetterType" : "CommitTransactionResult"
+      },
+      "wrapper" : false
+    },
+    "ExecuteSqlRequest" : {
+      "c2jName" : "ExecuteSqlRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request parameters represent the input of a request to run one or more SQL\n            statements.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ExecuteSql",
+        "locationName" : null,
+        "requestUri" : "/ExecuteSql",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "awsSecretStoreArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@param awsSecretStoreArn The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAwsSecretStoreArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.*/",
+        "getterMethodName" : "getAwsSecretStoreArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "awsSecretStoreArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "awsSecretStoreArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "AwsSecretStoreArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@param awsSecretStoreArn The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.*/",
+        "setterMethodName" : "setAwsSecretStoreArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "awsSecretStoreArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@param awsSecretStoreArn The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "awsSecretStoreArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "database",
+        "c2jShape" : "DbName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the database.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatabase",
+        "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+        "getterMethodName" : "getDatabase",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "database",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "database",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Database",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+        "setterMethodName" : "setDatabase",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "dbClusterOrInstanceArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The ARN of the Aurora Serverless DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@param dbClusterOrInstanceArn The ARN of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDbClusterOrInstanceArn",
+        "getterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@return The ARN of the Aurora Serverless DB cluster.*/",
+        "getterMethodName" : "getDbClusterOrInstanceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "dbClusterOrInstanceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "dbClusterOrInstanceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "DbClusterOrInstanceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@param dbClusterOrInstanceArn The ARN of the Aurora Serverless DB cluster.*/",
+        "setterMethodName" : "setDbClusterOrInstanceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "dbClusterOrInstanceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@param dbClusterOrInstanceArn The ARN of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "dbClusterOrInstanceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The ARN of the Aurora Serverless DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "schema",
+        "c2jShape" : "DbName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the database schema.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSchema",
+        "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+        "getterMethodName" : "getSchema",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "schema",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "schema",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Schema",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+        "setterMethodName" : "setSchema",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database schema.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "sqlStatements",
+        "c2jShape" : "SqlStatement",
+        "deprecated" : false,
+        "documentation" : "<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@param sqlStatements One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSqlStatements",
+        "getterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@return One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.*/",
+        "getterMethodName" : "getSqlStatements",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "sqlStatements",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "sqlStatements",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "SqlStatements",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@param sqlStatements One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.*/",
+        "setterMethodName" : "setSqlStatements",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "sqlStatements",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@param sqlStatements One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "sqlStatements",
+          "variableType" : "String",
+          "documentation" : "<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "AwsSecretStoreArn" : {
+          "c2jName" : "awsSecretStoreArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@param awsSecretStoreArn The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAwsSecretStoreArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.*/",
+          "getterMethodName" : "getAwsSecretStoreArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "awsSecretStoreArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "awsSecretStoreArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "AwsSecretStoreArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@param awsSecretStoreArn The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.*/",
+          "setterMethodName" : "setAwsSecretStoreArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "awsSecretStoreArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>\n@param awsSecretStoreArn The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "awsSecretStoreArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Database" : {
+          "c2jName" : "database",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatabase",
+          "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+          "getterMethodName" : "getDatabase",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "database",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "database",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Database",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+          "setterMethodName" : "setDatabase",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "DbClusterOrInstanceArn" : {
+          "c2jName" : "dbClusterOrInstanceArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The ARN of the Aurora Serverless DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@param dbClusterOrInstanceArn The ARN of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDbClusterOrInstanceArn",
+          "getterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@return The ARN of the Aurora Serverless DB cluster.*/",
+          "getterMethodName" : "getDbClusterOrInstanceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "dbClusterOrInstanceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "dbClusterOrInstanceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "DbClusterOrInstanceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@param dbClusterOrInstanceArn The ARN of the Aurora Serverless DB cluster.*/",
+          "setterMethodName" : "setDbClusterOrInstanceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "dbClusterOrInstanceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The ARN of the Aurora Serverless DB cluster.</p>\n@param dbClusterOrInstanceArn The ARN of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "dbClusterOrInstanceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The ARN of the Aurora Serverless DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Schema" : {
+          "c2jName" : "schema",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database schema.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSchema",
+          "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+          "getterMethodName" : "getSchema",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "schema",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "schema",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Schema",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+          "setterMethodName" : "setSchema",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database schema.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SqlStatements" : {
+          "c2jName" : "sqlStatements",
+          "c2jShape" : "SqlStatement",
+          "deprecated" : false,
+          "documentation" : "<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@param sqlStatements One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSqlStatements",
+          "getterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@return One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.*/",
+          "getterMethodName" : "getSqlStatements",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sqlStatements",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sqlStatements",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SqlStatements",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@param sqlStatements One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.*/",
+          "setterMethodName" : "setSqlStatements",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sqlStatements",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>\n@param sqlStatements One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sqlStatements",
+            "variableType" : "String",
+            "documentation" : "<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "awsSecretStoreArn", "dbClusterOrInstanceArn", "sqlStatements" ],
+      "shapeName" : "ExecuteSqlRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ExecuteSqlRequest",
+        "variableName" : "executeSqlRequest",
+        "variableType" : "ExecuteSqlRequest",
+        "documentation" : null,
+        "simpleType" : "ExecuteSqlRequest",
+        "variableSetterType" : "ExecuteSqlRequest"
+      },
+      "wrapper" : false
+    },
+    "ExecuteSqlResult" : {
+      "c2jName" : "ExecuteSqlResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The response elements represent the output of a request to run one or more SQL\n            statements.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "sqlStatementResults",
+        "c2jShape" : "SqlStatementResults",
+        "deprecated" : false,
+        "documentation" : "<p>The results of the SQL statement or statements.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n@param sqlStatementResults The results of the SQL statement or statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSqlStatementResults",
+        "getterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n@return The results of the SQL statement or statements.*/",
+        "getterMethodName" : "getSqlStatementResults",
+        "getterModel" : {
+          "returnType" : "java.util.List<SqlStatementResult>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "sqlStatementResults",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "sqlStatementResults",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "SqlStatementResult",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "SqlStatementResult",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "SqlStatementResult",
+              "variableName" : "member",
+              "variableType" : "SqlStatementResult",
+              "documentation" : "",
+              "simpleType" : "SqlStatementResult",
+              "variableSetterType" : "SqlStatementResult"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "SqlStatementResult",
+              "variableName" : "member",
+              "variableType" : "SqlStatementResult",
+              "documentation" : "",
+              "simpleType" : "SqlStatementResult",
+              "variableSetterType" : "SqlStatementResult"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "SqlStatementResult",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "SqlStatementResult",
+          "templateImplType" : "java.util.ArrayList<SqlStatementResult>",
+          "templateType" : "java.util.List<SqlStatementResult>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "SqlStatementResults",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n@param sqlStatementResults The results of the SQL statement or statements.*/",
+        "setterMethodName" : "setSqlStatementResults",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<SqlStatementResult>",
+          "variableName" : "sqlStatementResults",
+          "variableType" : "java.util.List<SqlStatementResult>",
+          "documentation" : "",
+          "simpleType" : "List<SqlStatementResult>",
+          "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSqlStatementResults(java.util.Collection)} or {@link #withSqlStatementResults(java.util.Collection)} if you want to override the existing values.</p>\n@param sqlStatementResults The results of the SQL statement or statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<SqlStatementResult>",
+          "variableName" : "sqlStatementResults",
+          "variableType" : "java.util.List<SqlStatementResult>",
+          "documentation" : "<p>The results of the SQL statement or statements.</p>",
+          "simpleType" : "List<SqlStatementResult>",
+          "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "SqlStatementResults" : {
+          "c2jName" : "sqlStatementResults",
+          "c2jShape" : "SqlStatementResults",
+          "deprecated" : false,
+          "documentation" : "<p>The results of the SQL statement or statements.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n@param sqlStatementResults The results of the SQL statement or statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSqlStatementResults",
+          "getterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n@return The results of the SQL statement or statements.*/",
+          "getterMethodName" : "getSqlStatementResults",
+          "getterModel" : {
+            "returnType" : "java.util.List<SqlStatementResult>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sqlStatementResults",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sqlStatementResults",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "SqlStatementResult",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "SqlStatementResult",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "SqlStatementResult",
+                "variableName" : "member",
+                "variableType" : "SqlStatementResult",
+                "documentation" : "",
+                "simpleType" : "SqlStatementResult",
+                "variableSetterType" : "SqlStatementResult"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "SqlStatementResult",
+                "variableName" : "member",
+                "variableType" : "SqlStatementResult",
+                "documentation" : "",
+                "simpleType" : "SqlStatementResult",
+                "variableSetterType" : "SqlStatementResult"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "SqlStatementResult",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "SqlStatementResult",
+            "templateImplType" : "java.util.ArrayList<SqlStatementResult>",
+            "templateType" : "java.util.List<SqlStatementResult>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "SqlStatementResults",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n@param sqlStatementResults The results of the SQL statement or statements.*/",
+          "setterMethodName" : "setSqlStatementResults",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<SqlStatementResult>",
+            "variableName" : "sqlStatementResults",
+            "variableType" : "java.util.List<SqlStatementResult>",
+            "documentation" : "",
+            "simpleType" : "List<SqlStatementResult>",
+            "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The results of the SQL statement or statements.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSqlStatementResults(java.util.Collection)} or {@link #withSqlStatementResults(java.util.Collection)} if you want to override the existing values.</p>\n@param sqlStatementResults The results of the SQL statement or statements.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<SqlStatementResult>",
+            "variableName" : "sqlStatementResults",
+            "variableType" : "java.util.List<SqlStatementResult>",
+            "documentation" : "<p>The results of the SQL statement or statements.</p>",
+            "simpleType" : "List<SqlStatementResult>",
+            "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ExecuteSqlResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ExecuteSqlResult",
+        "variableName" : "executeSqlResult",
+        "variableType" : "ExecuteSqlResult",
+        "documentation" : null,
+        "simpleType" : "ExecuteSqlResult",
+        "variableSetterType" : "ExecuteSqlResult"
+      },
+      "wrapper" : false
+    },
+    "ExecuteStatementRequest" : {
+      "c2jName" : "ExecuteStatementRequest",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The request parameters represent the input of a request to run a SQL statement against\n            a database.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ExecuteStatement",
+        "locationName" : null,
+        "requestUri" : "/Execute",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "continueAfterTimeout",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@param continueAfterTimeout A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withContinueAfterTimeout",
+        "getterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@return A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>*/",
+        "getterMethodName" : "getContinueAfterTimeout",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "continueAfterTimeout",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "continueAfterTimeout",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "ContinueAfterTimeout",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@param continueAfterTimeout A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>*/",
+        "setterMethodName" : "setContinueAfterTimeout",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "continueAfterTimeout",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@param continueAfterTimeout A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "continueAfterTimeout",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "database",
+        "c2jShape" : "DbName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the database.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDatabase",
+        "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+        "getterMethodName" : "getDatabase",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "database",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "database",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Database",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+        "setterMethodName" : "setDatabase",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "database",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "includeResultMetadata",
+        "c2jShape" : "Boolean",
+        "deprecated" : false,
+        "documentation" : "<p>A value that indicates whether to include metadata in the results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@param includeResultMetadata A value that indicates whether to include metadata in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIncludeResultMetadata",
+        "getterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@return A value that indicates whether to include metadata in the results.*/",
+        "getterMethodName" : "getIncludeResultMetadata",
+        "getterModel" : {
+          "returnType" : "Boolean",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "includeResultMetadata",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "includeResultMetadata",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "IncludeResultMetadata",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@param includeResultMetadata A value that indicates whether to include metadata in the results.*/",
+        "setterMethodName" : "setIncludeResultMetadata",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "includeResultMetadata",
+          "variableType" : "Boolean",
+          "documentation" : "",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@param includeResultMetadata A value that indicates whether to include metadata in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "includeResultMetadata",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value that indicates whether to include metadata in the results.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "parameters",
+        "c2jShape" : "SqlParametersList",
+        "deprecated" : false,
+        "documentation" : "<p>The parameters for the SQL statement.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n@param parameters The parameters for the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withParameters",
+        "getterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n@return The parameters for the SQL statement.*/",
+        "getterMethodName" : "getParameters",
+        "getterModel" : {
+          "returnType" : "java.util.List<SqlParameter>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "parameters",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "parameters",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "SqlParameter",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "SqlParameter",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "SqlParameter",
+              "variableName" : "member",
+              "variableType" : "SqlParameter",
+              "documentation" : "",
+              "simpleType" : "SqlParameter",
+              "variableSetterType" : "SqlParameter"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "SqlParameter",
+              "variableName" : "member",
+              "variableType" : "SqlParameter",
+              "documentation" : "",
+              "simpleType" : "SqlParameter",
+              "variableSetterType" : "SqlParameter"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "SqlParameter",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "SqlParameter",
+          "templateImplType" : "java.util.ArrayList<SqlParameter>",
+          "templateType" : "java.util.List<SqlParameter>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Parameters",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n@param parameters The parameters for the SQL statement.*/",
+        "setterMethodName" : "setParameters",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<SqlParameter>",
+          "variableName" : "parameters",
+          "variableType" : "java.util.List<SqlParameter>",
+          "documentation" : "",
+          "simpleType" : "List<SqlParameter>",
+          "variableSetterType" : "java.util.Collection<SqlParameter>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setParameters(java.util.Collection)} or {@link #withParameters(java.util.Collection)} if you want to override the existing values.</p>\n@param parameters The parameters for the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<SqlParameter>",
+          "variableName" : "parameters",
+          "variableType" : "java.util.List<SqlParameter>",
+          "documentation" : "<p>The parameters for the SQL statement.</p>",
+          "simpleType" : "List<SqlParameter>",
+          "variableSetterType" : "java.util.Collection<SqlParameter>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "resourceArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "getterMethodName" : "getResourceArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resourceArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resourceArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "schema",
+        "c2jShape" : "DbName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the database schema.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSchema",
+        "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+        "getterMethodName" : "getSchema",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "schema",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "schema",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Schema",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+        "setterMethodName" : "setSchema",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "schema",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the database schema.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "secretArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSecretArn",
+        "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+        "getterMethodName" : "getSecretArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "secretArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "secretArn",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "SecretArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+        "setterMethodName" : "setSecretArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "sql",
+        "c2jShape" : "SqlStatement",
+        "deprecated" : false,
+        "documentation" : "<p>The SQL statement to run.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSql",
+        "getterDocumentation" : "/**<p>The SQL statement to run.</p>\n@return The SQL statement to run.*/",
+        "getterMethodName" : "getSql",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "sql",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "sql",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Sql",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.*/",
+        "setterMethodName" : "setSql",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "sql",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "sql",
+          "variableType" : "String",
+          "documentation" : "<p>The SQL statement to run.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "transactionId",
+        "c2jShape" : "Id",
+        "deprecated" : false,
+        "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionId",
+        "getterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@return The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.*/",
+        "getterMethodName" : "getTransactionId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "transactionId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "transactionId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.*/",
+        "setterMethodName" : "setTransactionId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ContinueAfterTimeout" : {
+          "c2jName" : "continueAfterTimeout",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@param continueAfterTimeout A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withContinueAfterTimeout",
+          "getterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@return A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>*/",
+          "getterMethodName" : "getContinueAfterTimeout",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "continueAfterTimeout",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "continueAfterTimeout",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "ContinueAfterTimeout",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@param continueAfterTimeout A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>*/",
+          "setterMethodName" : "setContinueAfterTimeout",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "continueAfterTimeout",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>\n@param continueAfterTimeout A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "continueAfterTimeout",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Database" : {
+          "c2jName" : "database",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDatabase",
+          "getterDocumentation" : "/**<p>The name of the database.</p>\n@return The name of the database.*/",
+          "getterMethodName" : "getDatabase",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "database",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "database",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Database",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.*/",
+          "setterMethodName" : "setDatabase",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database.</p>\n@param database The name of the database.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "database",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "IncludeResultMetadata" : {
+          "c2jName" : "includeResultMetadata",
+          "c2jShape" : "Boolean",
+          "deprecated" : false,
+          "documentation" : "<p>A value that indicates whether to include metadata in the results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@param includeResultMetadata A value that indicates whether to include metadata in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIncludeResultMetadata",
+          "getterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@return A value that indicates whether to include metadata in the results.*/",
+          "getterMethodName" : "getIncludeResultMetadata",
+          "getterModel" : {
+            "returnType" : "Boolean",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "includeResultMetadata",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "includeResultMetadata",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "IncludeResultMetadata",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@param includeResultMetadata A value that indicates whether to include metadata in the results.*/",
+          "setterMethodName" : "setIncludeResultMetadata",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "includeResultMetadata",
+            "variableType" : "Boolean",
+            "documentation" : "",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>A value that indicates whether to include metadata in the results.</p>\n@param includeResultMetadata A value that indicates whether to include metadata in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "includeResultMetadata",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value that indicates whether to include metadata in the results.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Parameters" : {
+          "c2jName" : "parameters",
+          "c2jShape" : "SqlParametersList",
+          "deprecated" : false,
+          "documentation" : "<p>The parameters for the SQL statement.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n@param parameters The parameters for the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withParameters",
+          "getterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n@return The parameters for the SQL statement.*/",
+          "getterMethodName" : "getParameters",
+          "getterModel" : {
+            "returnType" : "java.util.List<SqlParameter>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "parameters",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "parameters",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "SqlParameter",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "SqlParameter",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "SqlParameter",
+                "variableName" : "member",
+                "variableType" : "SqlParameter",
+                "documentation" : "",
+                "simpleType" : "SqlParameter",
+                "variableSetterType" : "SqlParameter"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "SqlParameter",
+                "variableName" : "member",
+                "variableType" : "SqlParameter",
+                "documentation" : "",
+                "simpleType" : "SqlParameter",
+                "variableSetterType" : "SqlParameter"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "SqlParameter",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "SqlParameter",
+            "templateImplType" : "java.util.ArrayList<SqlParameter>",
+            "templateType" : "java.util.List<SqlParameter>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Parameters",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n@param parameters The parameters for the SQL statement.*/",
+          "setterMethodName" : "setParameters",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<SqlParameter>",
+            "variableName" : "parameters",
+            "variableType" : "java.util.List<SqlParameter>",
+            "documentation" : "",
+            "simpleType" : "List<SqlParameter>",
+            "variableSetterType" : "java.util.Collection<SqlParameter>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The parameters for the SQL statement.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setParameters(java.util.Collection)} or {@link #withParameters(java.util.Collection)} if you want to override the existing values.</p>\n@param parameters The parameters for the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<SqlParameter>",
+            "variableName" : "parameters",
+            "variableType" : "java.util.List<SqlParameter>",
+            "documentation" : "<p>The parameters for the SQL statement.</p>",
+            "simpleType" : "List<SqlParameter>",
+            "variableSetterType" : "java.util.Collection<SqlParameter>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "getterMethodName" : "getResourceArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "resourceArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "resourceArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Schema" : {
+          "c2jName" : "schema",
+          "c2jShape" : "DbName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the database schema.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSchema",
+          "getterDocumentation" : "/**<p>The name of the database schema.</p>\n@return The name of the database schema.*/",
+          "getterMethodName" : "getSchema",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "schema",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "schema",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Schema",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.*/",
+          "setterMethodName" : "setSchema",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the database schema.</p>\n@param schema The name of the database schema.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "schema",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the database schema.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SecretArn" : {
+          "c2jName" : "secretArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSecretArn",
+          "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+          "getterMethodName" : "getSecretArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "secretArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "secretArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SecretArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+          "setterMethodName" : "setSecretArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Sql" : {
+          "c2jName" : "sql",
+          "c2jShape" : "SqlStatement",
+          "deprecated" : false,
+          "documentation" : "<p>The SQL statement to run.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSql",
+          "getterDocumentation" : "/**<p>The SQL statement to run.</p>\n@return The SQL statement to run.*/",
+          "getterMethodName" : "getSql",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "sql",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "sql",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Sql",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.*/",
+          "setterMethodName" : "setSql",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sql",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The SQL statement to run.</p>\n@param sql The SQL statement to run.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "sql",
+            "variableType" : "String",
+            "documentation" : "<p>The SQL statement to run.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TransactionId" : {
+          "c2jName" : "transactionId",
+          "c2jShape" : "Id",
+          "deprecated" : false,
+          "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionId",
+          "getterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@return The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.*/",
+          "getterMethodName" : "getTransactionId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.*/",
+          "setterMethodName" : "setTransactionId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>\n@param transactionId The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "resourceArn", "secretArn", "sql" ],
+      "shapeName" : "ExecuteStatementRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ExecuteStatementRequest",
+        "variableName" : "executeStatementRequest",
+        "variableType" : "ExecuteStatementRequest",
+        "documentation" : null,
+        "simpleType" : "ExecuteStatementRequest",
+        "variableSetterType" : "ExecuteStatementRequest"
+      },
+      "wrapper" : false
+    },
+    "ExecuteStatementResult" : {
+      "c2jName" : "ExecuteStatementResponse",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The response elements represent the output of a request to run a SQL statement against\n            a database.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "columnMetadata",
+        "c2jShape" : "Metadata",
+        "deprecated" : false,
+        "documentation" : "<p>Metadata for the columns included in the results.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n@param columnMetadata Metadata for the columns included in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withColumnMetadata",
+        "getterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n@return Metadata for the columns included in the results.*/",
+        "getterMethodName" : "getColumnMetadata",
+        "getterModel" : {
+          "returnType" : "java.util.List<ColumnMetadata>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "columnMetadata",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "columnMetadata",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "ColumnMetadata",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "ColumnMetadata",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ColumnMetadata",
+              "variableName" : "member",
+              "variableType" : "ColumnMetadata",
+              "documentation" : "",
+              "simpleType" : "ColumnMetadata",
+              "variableSetterType" : "ColumnMetadata"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ColumnMetadata",
+              "variableName" : "member",
+              "variableType" : "ColumnMetadata",
+              "documentation" : "",
+              "simpleType" : "ColumnMetadata",
+              "variableSetterType" : "ColumnMetadata"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "ColumnMetadata",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "ColumnMetadata",
+          "templateImplType" : "java.util.ArrayList<ColumnMetadata>",
+          "templateType" : "java.util.List<ColumnMetadata>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "ColumnMetadata",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n@param columnMetadata Metadata for the columns included in the results.*/",
+        "setterMethodName" : "setColumnMetadata",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+          "variableName" : "columnMetadata",
+          "variableType" : "java.util.List<ColumnMetadata>",
+          "documentation" : "",
+          "simpleType" : "List<ColumnMetadata>",
+          "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want to override the existing values.</p>\n@param columnMetadata Metadata for the columns included in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+          "variableName" : "columnMetadata",
+          "variableType" : "java.util.List<ColumnMetadata>",
+          "documentation" : "<p>Metadata for the columns included in the results.</p>",
+          "simpleType" : "List<ColumnMetadata>",
+          "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "generatedFields",
+        "c2jShape" : "FieldList",
+        "deprecated" : false,
+        "documentation" : "<p>Values for fields generated during the request.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withGeneratedFields",
+        "getterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@return Values for fields generated during the request.*/",
+        "getterMethodName" : "getGeneratedFields",
+        "getterModel" : {
+          "returnType" : "java.util.List<Field>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "generatedFields",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "generatedFields",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Field",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Field",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Field",
+              "variableName" : "member",
+              "variableType" : "Field",
+              "documentation" : "",
+              "simpleType" : "Field",
+              "variableSetterType" : "Field"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Field",
+              "variableName" : "member",
+              "variableType" : "Field",
+              "documentation" : "",
+              "simpleType" : "Field",
+              "variableSetterType" : "Field"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Field",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Field",
+          "templateImplType" : "java.util.ArrayList<Field>",
+          "templateType" : "java.util.List<Field>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "GeneratedFields",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.*/",
+        "setterMethodName" : "setGeneratedFields",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Field>",
+          "variableName" : "generatedFields",
+          "variableType" : "java.util.List<Field>",
+          "documentation" : "",
+          "simpleType" : "List<Field>",
+          "variableSetterType" : "java.util.Collection<Field>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setGeneratedFields(java.util.Collection)} or {@link #withGeneratedFields(java.util.Collection)} if you want to override the existing values.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Field>",
+          "variableName" : "generatedFields",
+          "variableType" : "java.util.List<Field>",
+          "documentation" : "<p>Values for fields generated during the request.</p>",
+          "simpleType" : "List<Field>",
+          "variableSetterType" : "java.util.Collection<Field>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "numberOfRecordsUpdated",
+        "c2jShape" : "RecordsUpdated",
+        "deprecated" : false,
+        "documentation" : "<p>The number of records updated by the request.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@param numberOfRecordsUpdated The number of records updated by the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNumberOfRecordsUpdated",
+        "getterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@return The number of records updated by the request.*/",
+        "getterMethodName" : "getNumberOfRecordsUpdated",
+        "getterModel" : {
+          "returnType" : "Long",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "numberOfRecordsUpdated",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "numberOfRecordsUpdated",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "NumberOfRecordsUpdated",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@param numberOfRecordsUpdated The number of records updated by the request.*/",
+        "setterMethodName" : "setNumberOfRecordsUpdated",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "numberOfRecordsUpdated",
+          "variableType" : "Long",
+          "documentation" : "",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@param numberOfRecordsUpdated The number of records updated by the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "numberOfRecordsUpdated",
+          "variableType" : "Long",
+          "documentation" : "<p>The number of records updated by the request.</p>",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "records",
+        "c2jShape" : "SqlRecords",
+        "deprecated" : false,
+        "documentation" : "<p>The records returned by the SQL statement.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n@param records The records returned by the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRecords",
+        "getterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n@return The records returned by the SQL statement.*/",
+        "getterMethodName" : "getRecords",
+        "getterModel" : {
+          "returnType" : "java.util.List<java.util.List<Field>>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "records",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "records",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "FieldList",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "java.util.List<Field>",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : true,
+            "listModel" : {
+              "implType" : "java.util.ArrayList",
+              "interfaceType" : "java.util.List",
+              "listMemberModel" : {
+                "c2jName" : "member",
+                "c2jShape" : "Field",
+                "deprecated" : false,
+                "documentation" : "",
+                "enumType" : null,
+                "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                "fluentSetterMethodName" : "withMember",
+                "getterDocumentation" : "/**\n@return */",
+                "getterMethodName" : "getMember",
+                "getterModel" : {
+                  "returnType" : "Field",
+                  "documentation" : null
+                },
+                "http" : {
+                  "additionalMarshallingPath" : null,
+                  "additionalUnmarshallingPath" : null,
+                  "flattened" : false,
+                  "greedy" : false,
+                  "header" : false,
+                  "isPayload" : false,
+                  "isStreaming" : false,
+                  "location" : null,
+                  "marshallLocation" : "PAYLOAD",
+                  "marshallLocationName" : "member",
+                  "queryString" : false,
+                  "requiresLength" : false,
+                  "statusCode" : false,
+                  "unmarshallLocationName" : "member",
+                  "uri" : false
+                },
+                "idempotencyToken" : false,
+                "isBinary" : false,
+                "jsonValue" : false,
+                "list" : false,
+                "listModel" : null,
+                "map" : false,
+                "mapModel" : null,
+                "marshallingTargetClass" : "StructuredPojo",
+                "marshallingType" : "STRUCTURED",
+                "name" : "Member",
+                "sensitive" : false,
+                "setterDocumentation" : "/**\n@param member */",
+                "setterMethodName" : "setMember",
+                "setterModel" : {
+                  "timestampFormat" : null,
+                  "variableDeclarationType" : "Field",
+                  "variableName" : "member",
+                  "variableType" : "Field",
+                  "documentation" : "",
+                  "simpleType" : "Field",
+                  "variableSetterType" : "Field"
+                },
+                "shouldEmitLegacyEnumSetter" : false,
+                "simple" : false,
+                "unmarshallingType" : null,
+                "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                "variable" : {
+                  "timestampFormat" : null,
+                  "variableDeclarationType" : "Field",
+                  "variableName" : "member",
+                  "variableType" : "Field",
+                  "documentation" : "",
+                  "simpleType" : "Field",
+                  "variableSetterType" : "Field"
+                },
+                "xmlNameSpaceUri" : null
+              },
+              "memberLocationName" : null,
+              "memberType" : "Field",
+              "map" : false,
+              "marshallNonAutoConstructedEmptyLists" : false,
+              "memberAdditionalMarshallingPath" : null,
+              "memberAdditionalUnmarshallingPath" : null,
+              "sendEmptyQueryString" : false,
+              "simple" : false,
+              "simpleType" : "Field",
+              "templateImplType" : "java.util.ArrayList<Field>",
+              "templateType" : "java.util.List<Field>"
+            },
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "List",
+            "marshallingType" : "LIST",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "java.util.List<Field>",
+              "variableName" : "member",
+              "variableType" : "java.util.List<Field>",
+              "documentation" : "",
+              "simpleType" : "List<Field>",
+              "variableSetterType" : "java.util.Collection<Field>"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setMember(java.util.Collection)} or {@link #withMember(java.util.Collection)} if you want to override the existing values.</p>\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "java.util.List<Field>",
+              "variableName" : "member",
+              "variableType" : "java.util.List<Field>",
+              "documentation" : "",
+              "simpleType" : "List<Field>",
+              "variableSetterType" : "java.util.Collection<Field>"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "java.util.List<Field>",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "List<Field>",
+          "templateImplType" : "java.util.ArrayList<java.util.List<Field>>",
+          "templateType" : "java.util.List<java.util.List<Field>>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Records",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n@param records The records returned by the SQL statement.*/",
+        "setterMethodName" : "setRecords",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<java.util.List<Field>>",
+          "variableName" : "records",
+          "variableType" : "java.util.List<java.util.List<Field>>",
+          "documentation" : "",
+          "simpleType" : "List<Field>>",
+          "variableSetterType" : "java.util.Collection<java.util.List<Field>>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override the existing values.</p>\n@param records The records returned by the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<java.util.List<Field>>",
+          "variableName" : "records",
+          "variableType" : "java.util.List<java.util.List<Field>>",
+          "documentation" : "<p>The records returned by the SQL statement.</p>",
+          "simpleType" : "List<Field>>",
+          "variableSetterType" : "java.util.Collection<java.util.List<Field>>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "ColumnMetadata" : {
+          "c2jName" : "columnMetadata",
+          "c2jShape" : "Metadata",
+          "deprecated" : false,
+          "documentation" : "<p>Metadata for the columns included in the results.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n@param columnMetadata Metadata for the columns included in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withColumnMetadata",
+          "getterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n@return Metadata for the columns included in the results.*/",
+          "getterMethodName" : "getColumnMetadata",
+          "getterModel" : {
+            "returnType" : "java.util.List<ColumnMetadata>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "columnMetadata",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "columnMetadata",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "ColumnMetadata",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "ColumnMetadata",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ColumnMetadata",
+                "variableName" : "member",
+                "variableType" : "ColumnMetadata",
+                "documentation" : "",
+                "simpleType" : "ColumnMetadata",
+                "variableSetterType" : "ColumnMetadata"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ColumnMetadata",
+                "variableName" : "member",
+                "variableType" : "ColumnMetadata",
+                "documentation" : "",
+                "simpleType" : "ColumnMetadata",
+                "variableSetterType" : "ColumnMetadata"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "ColumnMetadata",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "ColumnMetadata",
+            "templateImplType" : "java.util.ArrayList<ColumnMetadata>",
+            "templateType" : "java.util.List<ColumnMetadata>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "ColumnMetadata",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n@param columnMetadata Metadata for the columns included in the results.*/",
+          "setterMethodName" : "setColumnMetadata",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+            "variableName" : "columnMetadata",
+            "variableType" : "java.util.List<ColumnMetadata>",
+            "documentation" : "",
+            "simpleType" : "List<ColumnMetadata>",
+            "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Metadata for the columns included in the results.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want to override the existing values.</p>\n@param columnMetadata Metadata for the columns included in the results.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+            "variableName" : "columnMetadata",
+            "variableType" : "java.util.List<ColumnMetadata>",
+            "documentation" : "<p>Metadata for the columns included in the results.</p>",
+            "simpleType" : "List<ColumnMetadata>",
+            "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "GeneratedFields" : {
+          "c2jName" : "generatedFields",
+          "c2jShape" : "FieldList",
+          "deprecated" : false,
+          "documentation" : "<p>Values for fields generated during the request.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withGeneratedFields",
+          "getterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@return Values for fields generated during the request.*/",
+          "getterMethodName" : "getGeneratedFields",
+          "getterModel" : {
+            "returnType" : "java.util.List<Field>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "generatedFields",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "generatedFields",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Field",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Field",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Field",
+                "variableName" : "member",
+                "variableType" : "Field",
+                "documentation" : "",
+                "simpleType" : "Field",
+                "variableSetterType" : "Field"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Field",
+                "variableName" : "member",
+                "variableType" : "Field",
+                "documentation" : "",
+                "simpleType" : "Field",
+                "variableSetterType" : "Field"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Field",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Field",
+            "templateImplType" : "java.util.ArrayList<Field>",
+            "templateType" : "java.util.List<Field>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "GeneratedFields",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.*/",
+          "setterMethodName" : "setGeneratedFields",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Field>",
+            "variableName" : "generatedFields",
+            "variableType" : "java.util.List<Field>",
+            "documentation" : "",
+            "simpleType" : "List<Field>",
+            "variableSetterType" : "java.util.Collection<Field>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setGeneratedFields(java.util.Collection)} or {@link #withGeneratedFields(java.util.Collection)} if you want to override the existing values.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Field>",
+            "variableName" : "generatedFields",
+            "variableType" : "java.util.List<Field>",
+            "documentation" : "<p>Values for fields generated during the request.</p>",
+            "simpleType" : "List<Field>",
+            "variableSetterType" : "java.util.Collection<Field>"
+          },
+          "xmlNameSpaceUri" : null
         },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "schemaName",
-        "c2jShape" : "String",
+        "NumberOfRecordsUpdated" : {
+          "c2jName" : "numberOfRecordsUpdated",
+          "c2jShape" : "RecordsUpdated",
+          "deprecated" : false,
+          "documentation" : "<p>The number of records updated by the request.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@param numberOfRecordsUpdated The number of records updated by the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNumberOfRecordsUpdated",
+          "getterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@return The number of records updated by the request.*/",
+          "getterMethodName" : "getNumberOfRecordsUpdated",
+          "getterModel" : {
+            "returnType" : "Long",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "numberOfRecordsUpdated",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "numberOfRecordsUpdated",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "NumberOfRecordsUpdated",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@param numberOfRecordsUpdated The number of records updated by the request.*/",
+          "setterMethodName" : "setNumberOfRecordsUpdated",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "numberOfRecordsUpdated",
+            "variableType" : "Long",
+            "documentation" : "",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The number of records updated by the request.</p>\n@param numberOfRecordsUpdated The number of records updated by the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "numberOfRecordsUpdated",
+            "variableType" : "Long",
+            "documentation" : "<p>The number of records updated by the request.</p>",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Records" : {
+          "c2jName" : "records",
+          "c2jShape" : "SqlRecords",
+          "deprecated" : false,
+          "documentation" : "<p>The records returned by the SQL statement.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n@param records The records returned by the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRecords",
+          "getterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n@return The records returned by the SQL statement.*/",
+          "getterMethodName" : "getRecords",
+          "getterModel" : {
+            "returnType" : "java.util.List<java.util.List<Field>>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "records",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "records",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "FieldList",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "java.util.List<Field>",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : true,
+              "listModel" : {
+                "implType" : "java.util.ArrayList",
+                "interfaceType" : "java.util.List",
+                "listMemberModel" : {
+                  "c2jName" : "member",
+                  "c2jShape" : "Field",
+                  "deprecated" : false,
+                  "documentation" : "",
+                  "enumType" : null,
+                  "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                  "fluentSetterMethodName" : "withMember",
+                  "getterDocumentation" : "/**\n@return */",
+                  "getterMethodName" : "getMember",
+                  "getterModel" : {
+                    "returnType" : "Field",
+                    "documentation" : null
+                  },
+                  "http" : {
+                    "additionalMarshallingPath" : null,
+                    "additionalUnmarshallingPath" : null,
+                    "flattened" : false,
+                    "greedy" : false,
+                    "header" : false,
+                    "isPayload" : false,
+                    "isStreaming" : false,
+                    "location" : null,
+                    "marshallLocation" : "PAYLOAD",
+                    "marshallLocationName" : "member",
+                    "queryString" : false,
+                    "requiresLength" : false,
+                    "statusCode" : false,
+                    "unmarshallLocationName" : "member",
+                    "uri" : false
+                  },
+                  "idempotencyToken" : false,
+                  "isBinary" : false,
+                  "jsonValue" : false,
+                  "list" : false,
+                  "listModel" : null,
+                  "map" : false,
+                  "mapModel" : null,
+                  "marshallingTargetClass" : "StructuredPojo",
+                  "marshallingType" : "STRUCTURED",
+                  "name" : "Member",
+                  "sensitive" : false,
+                  "setterDocumentation" : "/**\n@param member */",
+                  "setterMethodName" : "setMember",
+                  "setterModel" : {
+                    "timestampFormat" : null,
+                    "variableDeclarationType" : "Field",
+                    "variableName" : "member",
+                    "variableType" : "Field",
+                    "documentation" : "",
+                    "simpleType" : "Field",
+                    "variableSetterType" : "Field"
+                  },
+                  "shouldEmitLegacyEnumSetter" : false,
+                  "simple" : false,
+                  "unmarshallingType" : null,
+                  "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+                  "variable" : {
+                    "timestampFormat" : null,
+                    "variableDeclarationType" : "Field",
+                    "variableName" : "member",
+                    "variableType" : "Field",
+                    "documentation" : "",
+                    "simpleType" : "Field",
+                    "variableSetterType" : "Field"
+                  },
+                  "xmlNameSpaceUri" : null
+                },
+                "memberLocationName" : null,
+                "memberType" : "Field",
+                "map" : false,
+                "marshallNonAutoConstructedEmptyLists" : false,
+                "memberAdditionalMarshallingPath" : null,
+                "memberAdditionalUnmarshallingPath" : null,
+                "sendEmptyQueryString" : false,
+                "simple" : false,
+                "simpleType" : "Field",
+                "templateImplType" : "java.util.ArrayList<Field>",
+                "templateType" : "java.util.List<Field>"
+              },
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "List",
+              "marshallingType" : "LIST",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "java.util.List<Field>",
+                "variableName" : "member",
+                "variableType" : "java.util.List<Field>",
+                "documentation" : "",
+                "simpleType" : "List<Field>",
+                "variableSetterType" : "java.util.Collection<Field>"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setMember(java.util.Collection)} or {@link #withMember(java.util.Collection)} if you want to override the existing values.</p>\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "java.util.List<Field>",
+                "variableName" : "member",
+                "variableType" : "java.util.List<Field>",
+                "documentation" : "",
+                "simpleType" : "List<Field>",
+                "variableSetterType" : "java.util.Collection<Field>"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "java.util.List<Field>",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "List<Field>",
+            "templateImplType" : "java.util.ArrayList<java.util.List<Field>>",
+            "templateType" : "java.util.List<java.util.List<Field>>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Records",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n@param records The records returned by the SQL statement.*/",
+          "setterMethodName" : "setRecords",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<java.util.List<Field>>",
+            "variableName" : "records",
+            "variableType" : "java.util.List<java.util.List<Field>>",
+            "documentation" : "",
+            "simpleType" : "List<Field>>",
+            "variableSetterType" : "java.util.Collection<java.util.List<Field>>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The records returned by the SQL statement.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override the existing values.</p>\n@param records The records returned by the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<java.util.List<Field>>",
+            "variableName" : "records",
+            "variableType" : "java.util.List<java.util.List<Field>>",
+            "documentation" : "<p>The records returned by the SQL statement.</p>",
+            "simpleType" : "List<Field>>",
+            "variableSetterType" : "java.util.Collection<java.util.List<Field>>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ExecuteStatementResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ExecuteStatementResult",
+        "variableName" : "executeStatementResult",
+        "variableType" : "ExecuteStatementResult",
+        "documentation" : null,
+        "simpleType" : "ExecuteStatementResult",
+        "variableSetterType" : "ExecuteStatementResult"
+      },
+      "wrapper" : false
+    },
+    "Field" : {
+      "c2jName" : "Field",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>Contains a value.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "blobValue",
+        "c2jShape" : "Blob",
         "deprecated" : false,
-        "documentation" : "Designated column's table's schema",
+        "documentation" : "<p>A value of BLOB data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Designated column's table's schema\n@param schemaName Designated column's table's schema\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withSchemaName",
-        "getterDocumentation" : "/**Designated column's table's schema\n@return Designated column's table's schema*/",
-        "getterMethodName" : "getSchemaName",
+        "fluentSetterDocumentation" : "/**<p>A value of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBlobValue",
+        "getterDocumentation" : "/**<p>A value of BLOB data type.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return A value of BLOB data type.*/",
+        "getterMethodName" : "getBlobValue",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "java.nio.ByteBuffer",
           "documentation" : null
         },
         "http" : {
@@ -884,11 +9182,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "schemaName",
+          "marshallLocationName" : "blobValue",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "schemaName",
+          "unmarshallLocationName" : "blobValue",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -898,47 +9196,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "SchemaName",
+        "marshallingTargetClass" : "java.nio.ByteBuffer",
+        "marshallingType" : "BYTE_BUFFER",
+        "name" : "BlobValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Designated column's table's schema\n@param schemaName Designated column's table's schema*/",
-        "setterMethodName" : "setSchemaName",
+        "setterDocumentation" : "/**<p>A value of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value of BLOB data type.*/",
+        "setterMethodName" : "setBlobValue",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "schemaName",
-          "variableType" : "String",
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "blobValue",
+          "variableType" : "java.nio.ByteBuffer",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Designated column's table's schema\n@param schemaName Designated column's table's schema\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "schemaName",
-          "variableType" : "String",
-          "documentation" : "Designated column's table's schema",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value of BLOB data type.</p>\n@param blobValue A value of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.nio.ByteBuffer",
+          "variableName" : "blobValue",
+          "variableType" : "java.nio.ByteBuffer",
+          "documentation" : "<p>A value of BLOB data type.</p>",
+          "simpleType" : "ByteBuffer",
+          "variableSetterType" : "java.nio.ByteBuffer"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "tableName",
-        "c2jShape" : "String",
+        "c2jName" : "booleanValue",
+        "c2jShape" : "BoxedBoolean",
         "deprecated" : false,
-        "documentation" : "Designated column's table name",
+        "documentation" : "<p>A value of Boolean data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Designated column's table name\n@param tableName Designated column's table name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withTableName",
-        "getterDocumentation" : "/**Designated column's table name\n@return Designated column's table name*/",
-        "getterMethodName" : "getTableName",
+        "fluentSetterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@param booleanValue A value of Boolean data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withBooleanValue",
+        "getterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@return A value of Boolean data type.*/",
+        "getterMethodName" : "getBooleanValue",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "Boolean",
           "documentation" : null
         },
         "http" : {
@@ -951,11 +9249,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "tableName",
+          "marshallLocationName" : "booleanValue",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "tableName",
+          "unmarshallLocationName" : "booleanValue",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -965,47 +9263,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "TableName",
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "BooleanValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Designated column's table name\n@param tableName Designated column's table name*/",
-        "setterMethodName" : "setTableName",
+        "setterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@param booleanValue A value of Boolean data type.*/",
+        "setterMethodName" : "setBooleanValue",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "tableName",
-          "variableType" : "String",
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "booleanValue",
+          "variableType" : "Boolean",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Designated column's table name\n@param tableName Designated column's table name\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@param booleanValue A value of Boolean data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "tableName",
-          "variableType" : "String",
-          "documentation" : "Designated column's table name",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "booleanValue",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A value of Boolean data type.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "type",
-        "c2jShape" : "Integer",
+        "c2jName" : "doubleValue",
+        "c2jShape" : "BoxedDouble",
         "deprecated" : false,
-        "documentation" : "SQL type from java.sql.Types.",
+        "documentation" : "<p>A value of double data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**SQL type from java.sql.Types.\n@param type SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withType",
-        "getterDocumentation" : "/**SQL type from java.sql.Types.\n@return SQL type from java.sql.Types.*/",
-        "getterMethodName" : "getType",
+        "fluentSetterDocumentation" : "/**<p>A value of double data type.</p>\n@param doubleValue A value of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDoubleValue",
+        "getterDocumentation" : "/**<p>A value of double data type.</p>\n@return A value of double data type.*/",
+        "getterMethodName" : "getDoubleValue",
         "getterModel" : {
-          "returnType" : "Integer",
+          "returnType" : "Double",
           "documentation" : null
         },
         "http" : {
@@ -1018,11 +9316,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "type",
+          "marshallLocationName" : "doubleValue",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "type",
+          "unmarshallLocationName" : "doubleValue",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -1032,47 +9330,47 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "Type",
+        "marshallingTargetClass" : "Double",
+        "marshallingType" : "DOUBLE",
+        "name" : "DoubleValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**SQL type from java.sql.Types.\n@param type SQL type from java.sql.Types.*/",
-        "setterMethodName" : "setType",
+        "setterDocumentation" : "/**<p>A value of double data type.</p>\n@param doubleValue A value of double data type.*/",
+        "setterMethodName" : "setDoubleValue",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "type",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "Double",
+          "variableName" : "doubleValue",
+          "variableType" : "Double",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "Double",
+          "variableSetterType" : "Double"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**SQL type from java.sql.Types.\n@param type SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value of double data type.</p>\n@param doubleValue A value of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "type",
-          "variableType" : "Integer",
-          "documentation" : "SQL type from java.sql.Types.",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "Double",
+          "variableName" : "doubleValue",
+          "variableType" : "Double",
+          "documentation" : "<p>A value of double data type.</p>",
+          "simpleType" : "Double",
+          "variableSetterType" : "Double"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "typeName",
-        "c2jShape" : "String",
+        "c2jName" : "isNull",
+        "c2jShape" : "BoxedBoolean",
         "deprecated" : false,
-        "documentation" : "Database-specific type name.",
+        "documentation" : "<p>A NULL value.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Database-specific type name.\n@param typeName Database-specific type name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withTypeName",
-        "getterDocumentation" : "/**Database-specific type name.\n@return Database-specific type name.*/",
-        "getterMethodName" : "getTypeName",
+        "fluentSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withIsNull",
+        "getterDocumentation" : "/**<p>A NULL value.</p>\n@return A NULL value.*/",
+        "getterMethodName" : "getIsNull",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "Boolean",
           "documentation" : null
         },
         "http" : {
@@ -1085,11 +9383,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "typeName",
+          "marshallLocationName" : "isNull",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "typeName",
+          "unmarshallLocationName" : "isNull",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -1099,457 +9397,183 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "TypeName",
+        "marshallingTargetClass" : "Boolean",
+        "marshallingType" : "BOOLEAN",
+        "name" : "IsNull",
         "sensitive" : false,
-        "setterDocumentation" : "/**Database-specific type name.\n@param typeName Database-specific type name.*/",
-        "setterMethodName" : "setTypeName",
+        "setterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.*/",
+        "setterMethodName" : "setIsNull",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "typeName",
-          "variableType" : "String",
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isNull",
+          "variableType" : "Boolean",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Database-specific type name.\n@param typeName Database-specific type name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "typeName",
-          "variableType" : "String",
-          "documentation" : "Database-specific type name.",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "Boolean",
+          "variableName" : "isNull",
+          "variableType" : "Boolean",
+          "documentation" : "<p>A NULL value.</p>",
+          "simpleType" : "Boolean",
+          "variableSetterType" : "Boolean"
         },
         "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "ArrayBaseColumnType" : {
-          "c2jName" : "arrayBaseColumnType",
-          "c2jShape" : "Integer",
-          "deprecated" : false,
-          "documentation" : "Homogenous array base SQL type from java.sql.Types.",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@param arrayBaseColumnType Homogenous array base SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withArrayBaseColumnType",
-          "getterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@return Homogenous array base SQL type from java.sql.Types.*/",
-          "getterMethodName" : "getArrayBaseColumnType",
-          "getterModel" : {
-            "returnType" : "Integer",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "arrayBaseColumnType",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "arrayBaseColumnType",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "ArrayBaseColumnType",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@param arrayBaseColumnType Homogenous array base SQL type from java.sql.Types.*/",
-          "setterMethodName" : "setArrayBaseColumnType",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "arrayBaseColumnType",
-            "variableType" : "Integer",
-            "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Homogenous array base SQL type from java.sql.Types.\n@param arrayBaseColumnType Homogenous array base SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "arrayBaseColumnType",
-            "variableType" : "Integer",
-            "documentation" : "Homogenous array base SQL type from java.sql.Types.",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "longValue",
+        "c2jShape" : "BoxedLong",
+        "deprecated" : false,
+        "documentation" : "<p>A value of long data type.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value of long data type.</p>\n@param longValue A value of long data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withLongValue",
+        "getterDocumentation" : "/**<p>A value of long data type.</p>\n@return A value of long data type.*/",
+        "getterMethodName" : "getLongValue",
+        "getterModel" : {
+          "returnType" : "Long",
+          "documentation" : null
         },
-        "IsAutoIncrement" : {
-          "c2jName" : "isAutoIncrement",
-          "c2jShape" : "Boolean",
-          "deprecated" : false,
-          "documentation" : "Whether the designated column is automatically numbered",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Whether the designated column is automatically numbered\n@param isAutoIncrement Whether the designated column is automatically numbered\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withIsAutoIncrement",
-          "getterDocumentation" : "/**Whether the designated column is automatically numbered\n@return Whether the designated column is automatically numbered*/",
-          "getterMethodName" : "getIsAutoIncrement",
-          "getterModel" : {
-            "returnType" : "Boolean",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "isAutoIncrement",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "isAutoIncrement",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Boolean",
-          "marshallingType" : "BOOLEAN",
-          "name" : "IsAutoIncrement",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Whether the designated column is automatically numbered\n@param isAutoIncrement Whether the designated column is automatically numbered*/",
-          "setterMethodName" : "setIsAutoIncrement",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isAutoIncrement",
-            "variableType" : "Boolean",
-            "documentation" : "",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Whether the designated column is automatically numbered\n@param isAutoIncrement Whether the designated column is automatically numbered\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isAutoIncrement",
-            "variableType" : "Boolean",
-            "documentation" : "Whether the designated column is automatically numbered",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "xmlNameSpaceUri" : null
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "longValue",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "longValue",
+          "uri" : false
         },
-        "IsCaseSensitive" : {
-          "c2jName" : "isCaseSensitive",
-          "c2jShape" : "Boolean",
-          "deprecated" : false,
-          "documentation" : "Whether values in the designated column's case matters",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Whether values in the designated column's case matters\n@param isCaseSensitive Whether values in the designated column's case matters\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withIsCaseSensitive",
-          "getterDocumentation" : "/**Whether values in the designated column's case matters\n@return Whether values in the designated column's case matters*/",
-          "getterMethodName" : "getIsCaseSensitive",
-          "getterModel" : {
-            "returnType" : "Boolean",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "isCaseSensitive",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "isCaseSensitive",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Boolean",
-          "marshallingType" : "BOOLEAN",
-          "name" : "IsCaseSensitive",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Whether values in the designated column's case matters\n@param isCaseSensitive Whether values in the designated column's case matters*/",
-          "setterMethodName" : "setIsCaseSensitive",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isCaseSensitive",
-            "variableType" : "Boolean",
-            "documentation" : "",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Whether values in the designated column's case matters\n@param isCaseSensitive Whether values in the designated column's case matters\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isCaseSensitive",
-            "variableType" : "Boolean",
-            "documentation" : "Whether values in the designated column's case matters",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "xmlNameSpaceUri" : null
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "LongValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value of long data type.</p>\n@param longValue A value of long data type.*/",
+        "setterMethodName" : "setLongValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "longValue",
+          "variableType" : "Long",
+          "documentation" : "",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
-        "IsCurrency" : {
-          "c2jName" : "isCurrency",
-          "c2jShape" : "Boolean",
-          "deprecated" : false,
-          "documentation" : "Whether values in the designated column is a cash value",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Whether values in the designated column is a cash value\n@param isCurrency Whether values in the designated column is a cash value\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withIsCurrency",
-          "getterDocumentation" : "/**Whether values in the designated column is a cash value\n@return Whether values in the designated column is a cash value*/",
-          "getterMethodName" : "getIsCurrency",
-          "getterModel" : {
-            "returnType" : "Boolean",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "isCurrency",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "isCurrency",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Boolean",
-          "marshallingType" : "BOOLEAN",
-          "name" : "IsCurrency",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Whether values in the designated column is a cash value\n@param isCurrency Whether values in the designated column is a cash value*/",
-          "setterMethodName" : "setIsCurrency",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isCurrency",
-            "variableType" : "Boolean",
-            "documentation" : "",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Whether values in the designated column is a cash value\n@param isCurrency Whether values in the designated column is a cash value\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isCurrency",
-            "variableType" : "Boolean",
-            "documentation" : "Whether values in the designated column is a cash value",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "xmlNameSpaceUri" : null
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value of long data type.</p>\n@param longValue A value of long data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "longValue",
+          "variableType" : "Long",
+          "documentation" : "<p>A value of long data type.</p>",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
         },
-        "IsSigned" : {
-          "c2jName" : "isSigned",
-          "c2jShape" : "Boolean",
-          "deprecated" : false,
-          "documentation" : "Whether values in the designated column are signed numbers",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Whether values in the designated column are signed numbers\n@param isSigned Whether values in the designated column are signed numbers\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withIsSigned",
-          "getterDocumentation" : "/**Whether values in the designated column are signed numbers\n@return Whether values in the designated column are signed numbers*/",
-          "getterMethodName" : "getIsSigned",
-          "getterModel" : {
-            "returnType" : "Boolean",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "isSigned",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "isSigned",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Boolean",
-          "marshallingType" : "BOOLEAN",
-          "name" : "IsSigned",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Whether values in the designated column are signed numbers\n@param isSigned Whether values in the designated column are signed numbers*/",
-          "setterMethodName" : "setIsSigned",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isSigned",
-            "variableType" : "Boolean",
-            "documentation" : "",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Whether values in the designated column are signed numbers\n@param isSigned Whether values in the designated column are signed numbers\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Boolean",
-            "variableName" : "isSigned",
-            "variableType" : "Boolean",
-            "documentation" : "Whether values in the designated column are signed numbers",
-            "simpleType" : "Boolean",
-            "variableSetterType" : "Boolean"
-          },
-          "xmlNameSpaceUri" : null
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "stringValue",
+        "c2jShape" : "String",
+        "deprecated" : false,
+        "documentation" : "<p>A value of string data type.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>A value of string data type.</p>\n@param stringValue A value of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStringValue",
+        "getterDocumentation" : "/**<p>A value of string data type.</p>\n@return A value of string data type.*/",
+        "getterMethodName" : "getStringValue",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "stringValue",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "stringValue",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StringValue",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>A value of string data type.</p>\n@param stringValue A value of string data type.*/",
+        "setterMethodName" : "setStringValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stringValue",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
-        "Label" : {
-          "c2jName" : "label",
-          "c2jShape" : "String",
-          "deprecated" : false,
-          "documentation" : "Usually specified by the SQL AS. If not specified, return column name.",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@param label Usually specified by the SQL AS. If not specified, return column name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withLabel",
-          "getterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@return Usually specified by the SQL AS. If not specified, return column name.*/",
-          "getterMethodName" : "getLabel",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "label",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "label",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Label",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@param label Usually specified by the SQL AS. If not specified, return column name.*/",
-          "setterMethodName" : "setLabel",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "label",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Usually specified by the SQL AS. If not specified, return column name.\n@param label Usually specified by the SQL AS. If not specified, return column name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "label",
-            "variableType" : "String",
-            "documentation" : "Usually specified by the SQL AS. If not specified, return column name.",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>A value of string data type.</p>\n@param stringValue A value of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stringValue",
+          "variableType" : "String",
+          "documentation" : "<p>A value of string data type.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
-        "Name" : {
-          "c2jName" : "name",
-          "c2jShape" : "String",
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "BlobValue" : {
+          "c2jName" : "blobValue",
+          "c2jShape" : "Blob",
           "deprecated" : false,
-          "documentation" : "Name of the column.",
+          "documentation" : "<p>A value of BLOB data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Name of the column.\n@param name Name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withName",
-          "getterDocumentation" : "/**Name of the column.\n@return Name of the column.*/",
-          "getterMethodName" : "getName",
+          "fluentSetterDocumentation" : "/**<p>A value of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBlobValue",
+          "getterDocumentation" : "/**<p>A value of BLOB data type.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return A value of BLOB data type.*/",
+          "getterMethodName" : "getBlobValue",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "java.nio.ByteBuffer",
             "documentation" : null
           },
           "http" : {
@@ -1562,11 +9586,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "name",
+            "marshallLocationName" : "blobValue",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "name",
+            "unmarshallLocationName" : "blobValue",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -1576,48 +9600,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Name",
+          "marshallingTargetClass" : "java.nio.ByteBuffer",
+          "marshallingType" : "BYTE_BUFFER",
+          "name" : "BlobValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Name of the column.\n@param name Name of the column.*/",
-          "setterMethodName" : "setName",
+          "setterDocumentation" : "/**<p>A value of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value of BLOB data type.*/",
+          "setterMethodName" : "setBlobValue",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "name",
-            "variableType" : "String",
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "blobValue",
+            "variableType" : "java.nio.ByteBuffer",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Name of the column.\n@param name Name of the column.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value of BLOB data type.</p>\n@param blobValue A value of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "name",
-            "variableType" : "String",
-            "documentation" : "Name of the column.",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "java.nio.ByteBuffer",
+            "variableName" : "blobValue",
+            "variableType" : "java.nio.ByteBuffer",
+            "documentation" : "<p>A value of BLOB data type.</p>",
+            "simpleType" : "ByteBuffer",
+            "variableSetterType" : "java.nio.ByteBuffer"
           },
           "xmlNameSpaceUri" : null
         },
-        "Nullable" : {
-          "c2jName" : "nullable",
-          "c2jShape" : "Integer",
+        "BooleanValue" : {
+          "c2jName" : "booleanValue",
+          "c2jShape" : "BoxedBoolean",
           "deprecated" : false,
-          "documentation" : "Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)",
+          "documentation" : "<p>A value of Boolean data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@param nullable Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNullable",
-          "getterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@return Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)*/",
-          "getterMethodName" : "getNullable",
+          "fluentSetterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@param booleanValue A value of Boolean data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withBooleanValue",
+          "getterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@return A value of Boolean data type.*/",
+          "getterMethodName" : "getBooleanValue",
           "getterModel" : {
-            "returnType" : "Integer",
+            "returnType" : "Boolean",
             "documentation" : null
           },
           "http" : {
@@ -1630,11 +9654,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "nullable",
+            "marshallLocationName" : "booleanValue",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "nullable",
+            "unmarshallLocationName" : "booleanValue",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -1644,48 +9668,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "Nullable",
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "BooleanValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@param nullable Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)*/",
-          "setterMethodName" : "setNullable",
+          "setterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@param booleanValue A value of Boolean data type.*/",
+          "setterMethodName" : "setBooleanValue",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "nullable",
-            "variableType" : "Integer",
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "booleanValue",
+            "variableType" : "Boolean",
             "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@param nullable Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value of Boolean data type.</p>\n@param booleanValue A value of Boolean data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "nullable",
-            "variableType" : "Integer",
-            "documentation" : "Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "booleanValue",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A value of Boolean data type.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
           },
           "xmlNameSpaceUri" : null
         },
-        "Precision" : {
-          "c2jName" : "precision",
-          "c2jShape" : "Integer",
+        "DoubleValue" : {
+          "c2jName" : "doubleValue",
+          "c2jShape" : "BoxedDouble",
           "deprecated" : false,
-          "documentation" : "Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.",
+          "documentation" : "<p>A value of double data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@param precision Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withPrecision",
-          "getterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@return Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.*/",
-          "getterMethodName" : "getPrecision",
+          "fluentSetterDocumentation" : "/**<p>A value of double data type.</p>\n@param doubleValue A value of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDoubleValue",
+          "getterDocumentation" : "/**<p>A value of double data type.</p>\n@return A value of double data type.*/",
+          "getterMethodName" : "getDoubleValue",
           "getterModel" : {
-            "returnType" : "Integer",
+            "returnType" : "Double",
             "documentation" : null
           },
           "http" : {
@@ -1698,11 +9722,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "precision",
+            "marshallLocationName" : "doubleValue",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "precision",
+            "unmarshallLocationName" : "doubleValue",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -1712,48 +9736,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "Precision",
+          "marshallingTargetClass" : "Double",
+          "marshallingType" : "DOUBLE",
+          "name" : "DoubleValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@param precision Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.*/",
-          "setterMethodName" : "setPrecision",
+          "setterDocumentation" : "/**<p>A value of double data type.</p>\n@param doubleValue A value of double data type.*/",
+          "setterMethodName" : "setDoubleValue",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "precision",
-            "variableType" : "Integer",
+            "variableDeclarationType" : "Double",
+            "variableName" : "doubleValue",
+            "variableType" : "Double",
             "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "simpleType" : "Double",
+            "variableSetterType" : "Double"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@param precision Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value of double data type.</p>\n@param doubleValue A value of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "precision",
-            "variableType" : "Integer",
-            "documentation" : "Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable.",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "variableDeclarationType" : "Double",
+            "variableName" : "doubleValue",
+            "variableType" : "Double",
+            "documentation" : "<p>A value of double data type.</p>",
+            "simpleType" : "Double",
+            "variableSetterType" : "Double"
           },
           "xmlNameSpaceUri" : null
         },
-        "Scale" : {
-          "c2jName" : "scale",
-          "c2jShape" : "Integer",
+        "IsNull" : {
+          "c2jName" : "isNull",
+          "c2jShape" : "BoxedBoolean",
           "deprecated" : false,
-          "documentation" : "Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.",
+          "documentation" : "<p>A NULL value.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@param scale Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withScale",
-          "getterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@return Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.*/",
-          "getterMethodName" : "getScale",
+          "fluentSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withIsNull",
+          "getterDocumentation" : "/**<p>A NULL value.</p>\n@return A NULL value.*/",
+          "getterMethodName" : "getIsNull",
           "getterModel" : {
-            "returnType" : "Integer",
+            "returnType" : "Boolean",
             "documentation" : null
           },
           "http" : {
@@ -1766,11 +9790,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "scale",
+            "marshallLocationName" : "isNull",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "scale",
+            "unmarshallLocationName" : "isNull",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -1780,48 +9804,48 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "Scale",
+          "marshallingTargetClass" : "Boolean",
+          "marshallingType" : "BOOLEAN",
+          "name" : "IsNull",
           "sensitive" : false,
-          "setterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@param scale Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.*/",
-          "setterMethodName" : "setScale",
+          "setterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.*/",
+          "setterMethodName" : "setIsNull",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "scale",
-            "variableType" : "Integer",
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isNull",
+            "variableType" : "Boolean",
             "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@param scale Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "scale",
-            "variableType" : "Integer",
-            "documentation" : "Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable.",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "variableDeclarationType" : "Boolean",
+            "variableName" : "isNull",
+            "variableType" : "Boolean",
+            "documentation" : "<p>A NULL value.</p>",
+            "simpleType" : "Boolean",
+            "variableSetterType" : "Boolean"
           },
           "xmlNameSpaceUri" : null
         },
-        "SchemaName" : {
-          "c2jName" : "schemaName",
-          "c2jShape" : "String",
+        "LongValue" : {
+          "c2jName" : "longValue",
+          "c2jShape" : "BoxedLong",
           "deprecated" : false,
-          "documentation" : "Designated column's table's schema",
+          "documentation" : "<p>A value of long data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Designated column's table's schema\n@param schemaName Designated column's table's schema\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withSchemaName",
-          "getterDocumentation" : "/**Designated column's table's schema\n@return Designated column's table's schema*/",
-          "getterMethodName" : "getSchemaName",
+          "fluentSetterDocumentation" : "/**<p>A value of long data type.</p>\n@param longValue A value of long data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withLongValue",
+          "getterDocumentation" : "/**<p>A value of long data type.</p>\n@return A value of long data type.*/",
+          "getterMethodName" : "getLongValue",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "Long",
             "documentation" : null
           },
           "http" : {
@@ -1834,11 +9858,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "schemaName",
+            "marshallLocationName" : "longValue",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "schemaName",
+            "unmarshallLocationName" : "longValue",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -1848,46 +9872,46 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "SchemaName",
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "LongValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Designated column's table's schema\n@param schemaName Designated column's table's schema*/",
-          "setterMethodName" : "setSchemaName",
+          "setterDocumentation" : "/**<p>A value of long data type.</p>\n@param longValue A value of long data type.*/",
+          "setterMethodName" : "setLongValue",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "schemaName",
-            "variableType" : "String",
+            "variableDeclarationType" : "Long",
+            "variableName" : "longValue",
+            "variableType" : "Long",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Designated column's table's schema\n@param schemaName Designated column's table's schema\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value of long data type.</p>\n@param longValue A value of long data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "schemaName",
-            "variableType" : "String",
-            "documentation" : "Designated column's table's schema",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "Long",
+            "variableName" : "longValue",
+            "variableType" : "Long",
+            "documentation" : "<p>A value of long data type.</p>",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
           },
           "xmlNameSpaceUri" : null
         },
-        "TableName" : {
-          "c2jName" : "tableName",
+        "StringValue" : {
+          "c2jName" : "stringValue",
           "c2jShape" : "String",
           "deprecated" : false,
-          "documentation" : "Designated column's table name",
+          "documentation" : "<p>A value of string data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Designated column's table name\n@param tableName Designated column's table name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTableName",
-          "getterDocumentation" : "/**Designated column's table name\n@return Designated column's table name*/",
-          "getterMethodName" : "getTableName",
+          "fluentSetterDocumentation" : "/**<p>A value of string data type.</p>\n@param stringValue A value of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStringValue",
+          "getterDocumentation" : "/**<p>A value of string data type.</p>\n@return A value of string data type.*/",
+          "getterMethodName" : "getStringValue",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -1902,11 +9926,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "tableName",
+            "marshallLocationName" : "stringValue",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "tableName",
+            "unmarshallLocationName" : "stringValue",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -1918,14 +9942,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "TableName",
+          "name" : "StringValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Designated column's table name\n@param tableName Designated column's table name*/",
-          "setterMethodName" : "setTableName",
+          "setterDocumentation" : "/**<p>A value of string data type.</p>\n@param stringValue A value of string data type.*/",
+          "setterMethodName" : "setStringValue",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "tableName",
+            "variableName" : "stringValue",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -1934,98 +9958,335 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Designated column's table name\n@param tableName Designated column's table name\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value of string data type.</p>\n@param stringValue A value of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "tableName",
+            "variableName" : "stringValue",
             "variableType" : "String",
-            "documentation" : "Designated column's table name",
+            "documentation" : "<p>A value of string data type.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "Field",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "Field",
+        "variableName" : "field",
+        "variableType" : "Field",
+        "documentation" : null,
+        "simpleType" : "Field",
+        "variableSetterType" : "Field"
+      },
+      "wrapper" : false
+    },
+    "ForbiddenException" : {
+      "c2jName" : "ForbiddenException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>There are insufficient privileges to make the call.</p>",
+      "enums" : null,
+      "errorCode" : "ForbiddenException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ForbiddenException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ForbiddenException",
+        "variableName" : "forbiddenException",
+        "variableType" : "ForbiddenException",
+        "documentation" : null,
+        "simpleType" : "ForbiddenException",
+        "variableSetterType" : "ForbiddenException"
+      },
+      "wrapper" : false
+    },
+    "InternalServerErrorException" : {
+      "c2jName" : "InternalServerErrorException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>An internal error occurred.</p>",
+      "enums" : null,
+      "errorCode" : "InternalServerErrorException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "InternalServerErrorException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "InternalServerErrorException",
+        "variableName" : "internalServerErrorException",
+        "variableType" : "InternalServerErrorException",
+        "documentation" : null,
+        "simpleType" : "InternalServerErrorException",
+        "variableSetterType" : "InternalServerErrorException"
+      },
+      "wrapper" : false
+    },
+    "NotFoundException" : {
+      "c2jName" : "NotFoundException",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.</p>",
+      "enums" : null,
+      "errorCode" : "NotFoundException",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ ],
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "NotFoundException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "NotFoundException",
+        "variableName" : "notFoundException",
+        "variableType" : "NotFoundException",
+        "documentation" : null,
+        "simpleType" : "NotFoundException",
+        "variableSetterType" : "NotFoundException"
+      },
+      "wrapper" : false
+    },
+    "Record" : {
+      "c2jName" : "Record",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A record returned by a call.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "values",
+        "c2jShape" : "Row",
+        "deprecated" : false,
+        "documentation" : "<p>The values returned in the record.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The values returned in the record.</p>\n@param values The values returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withValues",
+        "getterDocumentation" : "/**<p>The values returned in the record.</p>\n@return The values returned in the record.*/",
+        "getterMethodName" : "getValues",
+        "getterModel" : {
+          "returnType" : "java.util.List<Value>",
+          "documentation" : null
         },
-        "Type" : {
-          "c2jName" : "type",
-          "c2jShape" : "Integer",
-          "deprecated" : false,
-          "documentation" : "SQL type from java.sql.Types.",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**SQL type from java.sql.Types.\n@param type SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withType",
-          "getterDocumentation" : "/**SQL type from java.sql.Types.\n@return SQL type from java.sql.Types.*/",
-          "getterMethodName" : "getType",
-          "getterModel" : {
-            "returnType" : "Integer",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "type",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "type",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "Integer",
-          "marshallingType" : "INTEGER",
-          "name" : "Type",
-          "sensitive" : false,
-          "setterDocumentation" : "/**SQL type from java.sql.Types.\n@param type SQL type from java.sql.Types.*/",
-          "setterMethodName" : "setType",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "type",
-            "variableType" : "Integer",
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "values",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "values",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Value",
+            "deprecated" : false,
             "documentation" : "",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**SQL type from java.sql.Types.\n@param type SQL type from java.sql.Types.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "Integer",
-            "variableName" : "type",
-            "variableType" : "Integer",
-            "documentation" : "SQL type from java.sql.Types.",
-            "simpleType" : "Integer",
-            "variableSetterType" : "Integer"
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Value",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Value",
+              "variableName" : "member",
+              "variableType" : "Value",
+              "documentation" : "",
+              "simpleType" : "Value",
+              "variableSetterType" : "Value"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Value",
+              "variableName" : "member",
+              "variableType" : "Value",
+              "documentation" : "",
+              "simpleType" : "Value",
+              "variableSetterType" : "Value"
+            },
+            "xmlNameSpaceUri" : null
           },
-          "xmlNameSpaceUri" : null
+          "memberLocationName" : null,
+          "memberType" : "Value",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Value",
+          "templateImplType" : "java.util.ArrayList<Value>",
+          "templateType" : "java.util.List<Value>"
         },
-        "TypeName" : {
-          "c2jName" : "typeName",
-          "c2jShape" : "String",
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Values",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The values returned in the record.</p>\n@param values The values returned in the record.*/",
+        "setterMethodName" : "setValues",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Value>",
+          "variableName" : "values",
+          "variableType" : "java.util.List<Value>",
+          "documentation" : "",
+          "simpleType" : "List<Value>",
+          "variableSetterType" : "java.util.Collection<Value>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The values returned in the record.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setValues(java.util.Collection)} or {@link #withValues(java.util.Collection)} if you want to override the existing values.</p>\n@param values The values returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Value>",
+          "variableName" : "values",
+          "variableType" : "java.util.List<Value>",
+          "documentation" : "<p>The values returned in the record.</p>",
+          "simpleType" : "List<Value>",
+          "variableSetterType" : "java.util.Collection<Value>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Values" : {
+          "c2jName" : "values",
+          "c2jShape" : "Row",
           "deprecated" : false,
-          "documentation" : "Database-specific type name.",
+          "documentation" : "<p>The values returned in the record.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Database-specific type name.\n@param typeName Database-specific type name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTypeName",
-          "getterDocumentation" : "/**Database-specific type name.\n@return Database-specific type name.*/",
-          "getterMethodName" : "getTypeName",
+          "fluentSetterDocumentation" : "/**<p>The values returned in the record.</p>\n@param values The values returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withValues",
+          "getterDocumentation" : "/**<p>The values returned in the record.</p>\n@return The values returned in the record.*/",
+          "getterMethodName" : "getValues",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "java.util.List<Value>",
             "documentation" : null
           },
           "http" : {
@@ -2038,47 +10299,129 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "typeName",
+            "marshallLocationName" : "values",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "typeName",
+            "unmarshallLocationName" : "values",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Value",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Value",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Value",
+                "variableName" : "member",
+                "variableType" : "Value",
+                "documentation" : "",
+                "simpleType" : "Value",
+                "variableSetterType" : "Value"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Value",
+                "variableName" : "member",
+                "variableType" : "Value",
+                "documentation" : "",
+                "simpleType" : "Value",
+                "variableSetterType" : "Value"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Value",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Value",
+            "templateImplType" : "java.util.ArrayList<Value>",
+            "templateType" : "java.util.List<Value>"
+          },
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "TypeName",
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Values",
           "sensitive" : false,
-          "setterDocumentation" : "/**Database-specific type name.\n@param typeName Database-specific type name.*/",
-          "setterMethodName" : "setTypeName",
+          "setterDocumentation" : "/**<p>The values returned in the record.</p>\n@param values The values returned in the record.*/",
+          "setterMethodName" : "setValues",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "typeName",
-            "variableType" : "String",
+            "variableDeclarationType" : "java.util.List<Value>",
+            "variableName" : "values",
+            "variableType" : "java.util.List<Value>",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "List<Value>",
+            "variableSetterType" : "java.util.Collection<Value>"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Database-specific type name.\n@param typeName Database-specific type name.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "typeName",
-            "variableType" : "String",
-            "documentation" : "Database-specific type name.",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The values returned in the record.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setValues(java.util.Collection)} or {@link #withValues(java.util.Collection)} if you want to override the existing values.</p>\n@param values The values returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<Value>",
+            "variableName" : "values",
+            "variableType" : "java.util.List<Value>",
+            "documentation" : "<p>The values returned in the record.</p>",
+            "simpleType" : "List<Value>",
+            "variableSetterType" : "java.util.Collection<Value>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -2086,7 +10429,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ColumnMetadata",
+      "shapeName" : "Record",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -2095,17 +10438,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ColumnMetadata",
-        "variableName" : "columnMetadata",
-        "variableType" : "ColumnMetadata",
+        "variableDeclarationType" : "Record",
+        "variableName" : "record",
+        "variableType" : "Record",
         "documentation" : null,
-        "simpleType" : "ColumnMetadata",
-        "variableSetterType" : "ColumnMetadata"
+        "simpleType" : "Record",
+        "variableSetterType" : "Record"
       },
       "wrapper" : false
     },
-    "ExecuteSqlRequest" : {
-      "c2jName" : "ExecuteSqlRequest",
+    "ResultFrame" : {
+      "c2jName" : "ResultFrame",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -2113,7 +10456,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Execute SQL Request",
+      "documentation" : "<p>The result set returned by a SQL statement.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -2121,160 +10464,19 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : {
-        "action" : "ExecuteSql",
-        "locationName" : null,
-        "requestUri" : "/ExecuteSql",
-        "target" : null,
-        "verb" : "POST",
-        "xmlNameSpaceUri" : null
-      },
+      "marshaller" : null,
       "members" : [ {
-        "c2jName" : "awsSecretStoreArn",
-        "c2jShape" : "Arn",
-        "deprecated" : false,
-        "documentation" : "ARN of the db credentials in AWS Secret Store or the friendly secret name",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@param awsSecretStoreArn ARN of the db credentials in AWS Secret Store or the friendly secret name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withAwsSecretStoreArn",
-        "getterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@return ARN of the db credentials in AWS Secret Store or the friendly secret name*/",
-        "getterMethodName" : "getAwsSecretStoreArn",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "awsSecretStoreArn",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "awsSecretStoreArn",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "AwsSecretStoreArn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@param awsSecretStoreArn ARN of the db credentials in AWS Secret Store or the friendly secret name*/",
-        "setterMethodName" : "setAwsSecretStoreArn",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "awsSecretStoreArn",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@param awsSecretStoreArn ARN of the db credentials in AWS Secret Store or the friendly secret name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "awsSecretStoreArn",
-          "variableType" : "String",
-          "documentation" : "ARN of the db credentials in AWS Secret Store or the friendly secret name",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "database",
-        "c2jShape" : "DbName",
-        "deprecated" : false,
-        "documentation" : "Target DB name",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**Target DB name\n@param database Target DB name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withDatabase",
-        "getterDocumentation" : "/**Target DB name\n@return Target DB name*/",
-        "getterMethodName" : "getDatabase",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "database",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "database",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Database",
-        "sensitive" : false,
-        "setterDocumentation" : "/**Target DB name\n@param database Target DB name*/",
-        "setterMethodName" : "setDatabase",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "database",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Target DB name\n@param database Target DB name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "database",
-          "variableType" : "String",
-          "documentation" : "Target DB name",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "dbClusterOrInstanceArn",
-        "c2jShape" : "Arn",
+        "c2jName" : "records",
+        "c2jShape" : "Records",
         "deprecated" : false,
-        "documentation" : "ARN of the target db cluster or instance",
+        "documentation" : "<p>The records in the result set.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**ARN of the target db cluster or instance\n@param dbClusterOrInstanceArn ARN of the target db cluster or instance\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withDbClusterOrInstanceArn",
-        "getterDocumentation" : "/**ARN of the target db cluster or instance\n@return ARN of the target db cluster or instance*/",
-        "getterMethodName" : "getDbClusterOrInstanceArn",
+        "fluentSetterDocumentation" : "/**<p>The records in the result set.</p>\n@param records The records in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRecords",
+        "getterDocumentation" : "/**<p>The records in the result set.</p>\n@return The records in the result set.*/",
+        "getterMethodName" : "getRecords",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "java.util.List<Record>",
           "documentation" : null
         },
         "http" : {
@@ -2287,128 +10489,143 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "dbClusterOrInstanceArn",
+          "marshallLocationName" : "records",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "dbClusterOrInstanceArn",
+          "unmarshallLocationName" : "records",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "DbClusterOrInstanceArn",
-        "sensitive" : false,
-        "setterDocumentation" : "/**ARN of the target db cluster or instance\n@param dbClusterOrInstanceArn ARN of the target db cluster or instance*/",
-        "setterMethodName" : "setDbClusterOrInstanceArn",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "dbClusterOrInstanceArn",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**ARN of the target db cluster or instance\n@param dbClusterOrInstanceArn ARN of the target db cluster or instance\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "dbClusterOrInstanceArn",
-          "variableType" : "String",
-          "documentation" : "ARN of the target db cluster or instance",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "schema",
-        "c2jShape" : "DbName",
-        "deprecated" : false,
-        "documentation" : "Target Schema name",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**Target Schema name\n@param schema Target Schema name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withSchema",
-        "getterDocumentation" : "/**Target Schema name\n@return Target Schema name*/",
-        "getterMethodName" : "getSchema",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "schema",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "schema",
-          "uri" : false
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Record",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Record",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Record",
+              "variableName" : "member",
+              "variableType" : "Record",
+              "documentation" : "",
+              "simpleType" : "Record",
+              "variableSetterType" : "Record"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Record",
+              "variableName" : "member",
+              "variableType" : "Record",
+              "documentation" : "",
+              "simpleType" : "Record",
+              "variableSetterType" : "Record"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Record",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Record",
+          "templateImplType" : "java.util.ArrayList<Record>",
+          "templateType" : "java.util.List<Record>"
         },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "Schema",
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Records",
         "sensitive" : false,
-        "setterDocumentation" : "/**Target Schema name\n@param schema Target Schema name*/",
-        "setterMethodName" : "setSchema",
+        "setterDocumentation" : "/**<p>The records in the result set.</p>\n@param records The records in the result set.*/",
+        "setterMethodName" : "setRecords",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "schema",
-          "variableType" : "String",
+          "variableDeclarationType" : "java.util.List<Record>",
+          "variableName" : "records",
+          "variableType" : "java.util.List<Record>",
           "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "simpleType" : "List<Record>",
+          "variableSetterType" : "java.util.Collection<Record>"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
+        "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Target Schema name\n@param schema Target Schema name\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The records in the result set.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override the existing values.</p>\n@param records The records in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "schema",
-          "variableType" : "String",
-          "documentation" : "Target Schema name",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
+          "variableDeclarationType" : "java.util.List<Record>",
+          "variableName" : "records",
+          "variableType" : "java.util.List<Record>",
+          "documentation" : "<p>The records in the result set.</p>",
+          "simpleType" : "List<Record>",
+          "variableSetterType" : "java.util.Collection<Record>"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "sqlStatements",
-        "c2jShape" : "SqlStatement",
+        "c2jName" : "resultSetMetadata",
+        "c2jShape" : "ResultSetMetadata",
         "deprecated" : false,
-        "documentation" : "SQL statement(s) to be executed. Statements can be chained by using semicolons",
+        "documentation" : "<p>The result-set metadata in the result set.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@param sqlStatements SQL statement(s) to be executed. Statements can be chained by using semicolons\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withSqlStatements",
-        "getterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@return SQL statement(s) to be executed. Statements can be chained by using semicolons*/",
-        "getterMethodName" : "getSqlStatements",
+        "fluentSetterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@param resultSetMetadata The result-set metadata in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResultSetMetadata",
+        "getterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@return The result-set metadata in the result set.*/",
+        "getterMethodName" : "getResultSetMetadata",
         "getterModel" : {
-          "returnType" : "String",
+          "returnType" : "ResultSetMetadata",
           "documentation" : null
         },
         "http" : {
@@ -2421,11 +10638,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "sqlStatements",
+          "marshallLocationName" : "resultSetMetadata",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "sqlStatements",
+          "unmarshallLocationName" : "resultSetMetadata",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -2435,253 +10652,49 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "SqlStatements",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ResultSetMetadata",
         "sensitive" : false,
-        "setterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@param sqlStatements SQL statement(s) to be executed. Statements can be chained by using semicolons*/",
-        "setterMethodName" : "setSqlStatements",
+        "setterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@param resultSetMetadata The result-set metadata in the result set.*/",
+        "setterMethodName" : "setResultSetMetadata",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "sqlStatements",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@param sqlStatements SQL statement(s) to be executed. Statements can be chained by using semicolons\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "sqlStatements",
-          "variableType" : "String",
-          "documentation" : "SQL statement(s) to be executed. Statements can be chained by using semicolons",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "AwsSecretStoreArn" : {
-          "c2jName" : "awsSecretStoreArn",
-          "c2jShape" : "Arn",
-          "deprecated" : false,
-          "documentation" : "ARN of the db credentials in AWS Secret Store or the friendly secret name",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@param awsSecretStoreArn ARN of the db credentials in AWS Secret Store or the friendly secret name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withAwsSecretStoreArn",
-          "getterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@return ARN of the db credentials in AWS Secret Store or the friendly secret name*/",
-          "getterMethodName" : "getAwsSecretStoreArn",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "awsSecretStoreArn",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "awsSecretStoreArn",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "AwsSecretStoreArn",
-          "sensitive" : false,
-          "setterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@param awsSecretStoreArn ARN of the db credentials in AWS Secret Store or the friendly secret name*/",
-          "setterMethodName" : "setAwsSecretStoreArn",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "awsSecretStoreArn",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**ARN of the db credentials in AWS Secret Store or the friendly secret name\n@param awsSecretStoreArn ARN of the db credentials in AWS Secret Store or the friendly secret name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "awsSecretStoreArn",
-            "variableType" : "String",
-            "documentation" : "ARN of the db credentials in AWS Secret Store or the friendly secret name",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "Database" : {
-          "c2jName" : "database",
-          "c2jShape" : "DbName",
-          "deprecated" : false,
-          "documentation" : "Target DB name",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**Target DB name\n@param database Target DB name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withDatabase",
-          "getterDocumentation" : "/**Target DB name\n@return Target DB name*/",
-          "getterMethodName" : "getDatabase",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "database",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "database",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Database",
-          "sensitive" : false,
-          "setterDocumentation" : "/**Target DB name\n@param database Target DB name*/",
-          "setterMethodName" : "setDatabase",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "database",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Target DB name\n@param database Target DB name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "database",
-            "variableType" : "String",
-            "documentation" : "Target DB name",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
+          "variableDeclarationType" : "ResultSetMetadata",
+          "variableName" : "resultSetMetadata",
+          "variableType" : "ResultSetMetadata",
+          "documentation" : "",
+          "simpleType" : "ResultSetMetadata",
+          "variableSetterType" : "ResultSetMetadata"
         },
-        "DbClusterOrInstanceArn" : {
-          "c2jName" : "dbClusterOrInstanceArn",
-          "c2jShape" : "Arn",
-          "deprecated" : false,
-          "documentation" : "ARN of the target db cluster or instance",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**ARN of the target db cluster or instance\n@param dbClusterOrInstanceArn ARN of the target db cluster or instance\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withDbClusterOrInstanceArn",
-          "getterDocumentation" : "/**ARN of the target db cluster or instance\n@return ARN of the target db cluster or instance*/",
-          "getterMethodName" : "getDbClusterOrInstanceArn",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "dbClusterOrInstanceArn",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "dbClusterOrInstanceArn",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "DbClusterOrInstanceArn",
-          "sensitive" : false,
-          "setterDocumentation" : "/**ARN of the target db cluster or instance\n@param dbClusterOrInstanceArn ARN of the target db cluster or instance*/",
-          "setterMethodName" : "setDbClusterOrInstanceArn",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "dbClusterOrInstanceArn",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**ARN of the target db cluster or instance\n@param dbClusterOrInstanceArn ARN of the target db cluster or instance\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "dbClusterOrInstanceArn",
-            "variableType" : "String",
-            "documentation" : "ARN of the target db cluster or instance",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@param resultSetMetadata The result-set metadata in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "ResultSetMetadata",
+          "variableName" : "resultSetMetadata",
+          "variableType" : "ResultSetMetadata",
+          "documentation" : "<p>The result-set metadata in the result set.</p>",
+          "simpleType" : "ResultSetMetadata",
+          "variableSetterType" : "ResultSetMetadata"
         },
-        "Schema" : {
-          "c2jName" : "schema",
-          "c2jShape" : "DbName",
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Records" : {
+          "c2jName" : "records",
+          "c2jShape" : "Records",
           "deprecated" : false,
-          "documentation" : "Target Schema name",
+          "documentation" : "<p>The records in the result set.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Target Schema name\n@param schema Target Schema name\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withSchema",
-          "getterDocumentation" : "/**Target Schema name\n@return Target Schema name*/",
-          "getterMethodName" : "getSchema",
+          "fluentSetterDocumentation" : "/**<p>The records in the result set.</p>\n@param records The records in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRecords",
+          "getterDocumentation" : "/**<p>The records in the result set.</p>\n@return The records in the result set.*/",
+          "getterMethodName" : "getRecords",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "java.util.List<Record>",
             "documentation" : null
           },
           "http" : {
@@ -2694,62 +10707,144 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "schema",
+            "marshallLocationName" : "records",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "schema",
+            "unmarshallLocationName" : "records",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Record",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Record",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Record",
+                "variableName" : "member",
+                "variableType" : "Record",
+                "documentation" : "",
+                "simpleType" : "Record",
+                "variableSetterType" : "Record"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Record",
+                "variableName" : "member",
+                "variableType" : "Record",
+                "documentation" : "",
+                "simpleType" : "Record",
+                "variableSetterType" : "Record"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Record",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Record",
+            "templateImplType" : "java.util.ArrayList<Record>",
+            "templateType" : "java.util.List<Record>"
+          },
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "Schema",
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Records",
           "sensitive" : false,
-          "setterDocumentation" : "/**Target Schema name\n@param schema Target Schema name*/",
-          "setterMethodName" : "setSchema",
+          "setterDocumentation" : "/**<p>The records in the result set.</p>\n@param records The records in the result set.*/",
+          "setterMethodName" : "setRecords",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "schema",
-            "variableType" : "String",
+            "variableDeclarationType" : "java.util.List<Record>",
+            "variableName" : "records",
+            "variableType" : "java.util.List<Record>",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "List<Record>",
+            "variableSetterType" : "java.util.Collection<Record>"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Target Schema name\n@param schema Target Schema name\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The records in the result set.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override the existing values.</p>\n@param records The records in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "schema",
-            "variableType" : "String",
-            "documentation" : "Target Schema name",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "java.util.List<Record>",
+            "variableName" : "records",
+            "variableType" : "java.util.List<Record>",
+            "documentation" : "<p>The records in the result set.</p>",
+            "simpleType" : "List<Record>",
+            "variableSetterType" : "java.util.Collection<Record>"
           },
           "xmlNameSpaceUri" : null
         },
-        "SqlStatements" : {
-          "c2jName" : "sqlStatements",
-          "c2jShape" : "SqlStatement",
+        "ResultSetMetadata" : {
+          "c2jName" : "resultSetMetadata",
+          "c2jShape" : "ResultSetMetadata",
           "deprecated" : false,
-          "documentation" : "SQL statement(s) to be executed. Statements can be chained by using semicolons",
+          "documentation" : "<p>The result-set metadata in the result set.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@param sqlStatements SQL statement(s) to be executed. Statements can be chained by using semicolons\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withSqlStatements",
-          "getterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@return SQL statement(s) to be executed. Statements can be chained by using semicolons*/",
-          "getterMethodName" : "getSqlStatements",
+          "fluentSetterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@param resultSetMetadata The result-set metadata in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResultSetMetadata",
+          "getterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@return The result-set metadata in the result set.*/",
+          "getterMethodName" : "getResultSetMetadata",
           "getterModel" : {
-            "returnType" : "String",
+            "returnType" : "ResultSetMetadata",
             "documentation" : null
           },
           "http" : {
@@ -2762,11 +10857,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "sqlStatements",
+            "marshallLocationName" : "resultSetMetadata",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "sqlStatements",
+            "unmarshallLocationName" : "resultSetMetadata",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -2776,57 +10871,60 @@
           "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "SqlStatements",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ResultSetMetadata",
           "sensitive" : false,
-          "setterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@param sqlStatements SQL statement(s) to be executed. Statements can be chained by using semicolons*/",
-          "setterMethodName" : "setSqlStatements",
+          "setterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@param resultSetMetadata The result-set metadata in the result set.*/",
+          "setterMethodName" : "setResultSetMetadata",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "sqlStatements",
-            "variableType" : "String",
+            "variableDeclarationType" : "ResultSetMetadata",
+            "variableName" : "resultSetMetadata",
+            "variableType" : "ResultSetMetadata",
             "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "simpleType" : "ResultSetMetadata",
+            "variableSetterType" : "ResultSetMetadata"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
+          "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**SQL statement(s) to be executed. Statements can be chained by using semicolons\n@param sqlStatements SQL statement(s) to be executed. Statements can be chained by using semicolons\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The result-set metadata in the result set.</p>\n@param resultSetMetadata The result-set metadata in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "sqlStatements",
-            "variableType" : "String",
-            "documentation" : "SQL statement(s) to be executed. Statements can be chained by using semicolons",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
+            "variableDeclarationType" : "ResultSetMetadata",
+            "variableName" : "resultSetMetadata",
+            "variableType" : "ResultSetMetadata",
+            "documentation" : "<p>The result-set metadata in the result set.</p>",
+            "simpleType" : "ResultSetMetadata",
+            "variableSetterType" : "ResultSetMetadata"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "awsSecretStoreArn", "dbClusterOrInstanceArn", "sqlStatements" ],
-      "shapeName" : "ExecuteSqlRequest",
+      "required" : null,
+      "shapeName" : "ResultFrame",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ExecuteSqlRequest",
-        "variableName" : "executeSqlRequest",
-        "variableType" : "ExecuteSqlRequest",
+        "variableDeclarationType" : "ResultFrame",
+        "variableName" : "resultFrame",
+        "variableType" : "ResultFrame",
         "documentation" : null,
-        "simpleType" : "ExecuteSqlRequest",
-        "variableSetterType" : "ExecuteSqlRequest"
+        "simpleType" : "ResultFrame",
+        "variableSetterType" : "ResultFrame"
       },
       "wrapper" : false
     },
-    "ExecuteSqlResult" : {
-      "c2jName" : "ExecuteSqlResponse",
+    "ResultSetMetadata" : {
+      "c2jName" : "ResultSetMetadata",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -2834,7 +10932,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Execute SQL response",
+      "documentation" : "<p>The metadata of the result set returned by a SQL statement.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -2844,17 +10942,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "sqlStatementResults",
-        "c2jShape" : "SqlStatementResults",
+        "c2jName" : "columnCount",
+        "c2jShape" : "Long",
         "deprecated" : false,
-        "documentation" : "Results returned by executing the sql statement(s)",
+        "documentation" : "<p>The number of columns in the result set.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Results returned by executing the sql statement(s)\n@param sqlStatementResults Results returned by executing the sql statement(s)\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withSqlStatementResults",
-        "getterDocumentation" : "/**Results returned by executing the sql statement(s)\n@return Results returned by executing the sql statement(s)*/",
-        "getterMethodName" : "getSqlStatementResults",
+        "fluentSetterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@param columnCount The number of columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withColumnCount",
+        "getterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@return The number of columns in the result set.*/",
+        "getterMethodName" : "getColumnCount",
         "getterModel" : {
-          "returnType" : "java.util.List<SqlStatementResult>",
+          "returnType" : "Long",
           "documentation" : null
         },
         "http" : {
@@ -2867,11 +10965,78 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "sqlStatementResults",
+          "marshallLocationName" : "columnCount",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "sqlStatementResults",
+          "unmarshallLocationName" : "columnCount",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Long",
+        "marshallingType" : "LONG",
+        "name" : "ColumnCount",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@param columnCount The number of columns in the result set.*/",
+        "setterMethodName" : "setColumnCount",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "columnCount",
+          "variableType" : "Long",
+          "documentation" : "",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@param columnCount The number of columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "columnCount",
+          "variableType" : "Long",
+          "documentation" : "<p>The number of columns in the result set.</p>",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "columnMetadata",
+        "c2jShape" : "Metadata",
+        "deprecated" : false,
+        "documentation" : "<p>The metadata of the columns in the result set.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n@param columnMetadata The metadata of the columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withColumnMetadata",
+        "getterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n@return The metadata of the columns in the result set.*/",
+        "getterMethodName" : "getColumnMetadata",
+        "getterModel" : {
+          "returnType" : "java.util.List<ColumnMetadata>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "columnMetadata",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "columnMetadata",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -2883,7 +11048,7 @@
           "interfaceType" : "java.util.List",
           "listMemberModel" : {
             "c2jName" : "member",
-            "c2jShape" : "SqlStatementResult",
+            "c2jShape" : "ColumnMetadata",
             "deprecated" : false,
             "documentation" : "",
             "enumType" : null,
@@ -2892,7 +11057,7 @@
             "getterDocumentation" : "/**\n@return */",
             "getterMethodName" : "getMember",
             "getterModel" : {
-              "returnType" : "SqlStatementResult",
+              "returnType" : "ColumnMetadata",
               "documentation" : null
             },
             "http" : {
@@ -2927,12 +11092,12 @@
             "setterMethodName" : "setMember",
             "setterModel" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "SqlStatementResult",
+              "variableDeclarationType" : "ColumnMetadata",
               "variableName" : "member",
-              "variableType" : "SqlStatementResult",
+              "variableType" : "ColumnMetadata",
               "documentation" : "",
-              "simpleType" : "SqlStatementResult",
-              "variableSetterType" : "SqlStatementResult"
+              "simpleType" : "ColumnMetadata",
+              "variableSetterType" : "ColumnMetadata"
             },
             "shouldEmitLegacyEnumSetter" : false,
             "simple" : false,
@@ -2940,72 +11105,72 @@
             "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "SqlStatementResult",
+              "variableDeclarationType" : "ColumnMetadata",
               "variableName" : "member",
-              "variableType" : "SqlStatementResult",
+              "variableType" : "ColumnMetadata",
               "documentation" : "",
-              "simpleType" : "SqlStatementResult",
-              "variableSetterType" : "SqlStatementResult"
+              "simpleType" : "ColumnMetadata",
+              "variableSetterType" : "ColumnMetadata"
             },
             "xmlNameSpaceUri" : null
           },
           "memberLocationName" : null,
-          "memberType" : "SqlStatementResult",
+          "memberType" : "ColumnMetadata",
           "map" : false,
           "marshallNonAutoConstructedEmptyLists" : false,
           "memberAdditionalMarshallingPath" : null,
           "memberAdditionalUnmarshallingPath" : null,
           "sendEmptyQueryString" : false,
           "simple" : false,
-          "simpleType" : "SqlStatementResult",
-          "templateImplType" : "java.util.ArrayList<SqlStatementResult>",
-          "templateType" : "java.util.List<SqlStatementResult>"
+          "simpleType" : "ColumnMetadata",
+          "templateImplType" : "java.util.ArrayList<ColumnMetadata>",
+          "templateType" : "java.util.List<ColumnMetadata>"
         },
         "map" : false,
         "mapModel" : null,
         "marshallingTargetClass" : "List",
         "marshallingType" : "LIST",
-        "name" : "SqlStatementResults",
+        "name" : "ColumnMetadata",
         "sensitive" : false,
-        "setterDocumentation" : "/**Results returned by executing the sql statement(s)\n@param sqlStatementResults Results returned by executing the sql statement(s)*/",
-        "setterMethodName" : "setSqlStatementResults",
+        "setterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n@param columnMetadata The metadata of the columns in the result set.*/",
+        "setterMethodName" : "setColumnMetadata",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<SqlStatementResult>",
-          "variableName" : "sqlStatementResults",
-          "variableType" : "java.util.List<SqlStatementResult>",
+          "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+          "variableName" : "columnMetadata",
+          "variableType" : "java.util.List<ColumnMetadata>",
           "documentation" : "",
-          "simpleType" : "List<SqlStatementResult>",
-          "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+          "simpleType" : "List<ColumnMetadata>",
+          "variableSetterType" : "java.util.Collection<ColumnMetadata>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Results returned by executing the sql statement(s)\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSqlStatementResults(java.util.Collection)} or {@link #withSqlStatementResults(java.util.Collection)} if you want to override the existing values.</p>\n@param sqlStatementResults Results returned by executing the sql statement(s)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want to override the existing values.</p>\n@param columnMetadata The metadata of the columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<SqlStatementResult>",
-          "variableName" : "sqlStatementResults",
-          "variableType" : "java.util.List<SqlStatementResult>",
-          "documentation" : "Results returned by executing the sql statement(s)",
-          "simpleType" : "List<SqlStatementResult>",
-          "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+          "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+          "variableName" : "columnMetadata",
+          "variableType" : "java.util.List<ColumnMetadata>",
+          "documentation" : "<p>The metadata of the columns in the result set.</p>",
+          "simpleType" : "List<ColumnMetadata>",
+          "variableSetterType" : "java.util.Collection<ColumnMetadata>"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "SqlStatementResults" : {
-          "c2jName" : "sqlStatementResults",
-          "c2jShape" : "SqlStatementResults",
+        "ColumnCount" : {
+          "c2jName" : "columnCount",
+          "c2jShape" : "Long",
           "deprecated" : false,
-          "documentation" : "Results returned by executing the sql statement(s)",
+          "documentation" : "<p>The number of columns in the result set.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Results returned by executing the sql statement(s)\n@param sqlStatementResults Results returned by executing the sql statement(s)\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withSqlStatementResults",
-          "getterDocumentation" : "/**Results returned by executing the sql statement(s)\n@return Results returned by executing the sql statement(s)*/",
-          "getterMethodName" : "getSqlStatementResults",
+          "fluentSetterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@param columnCount The number of columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withColumnCount",
+          "getterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@return The number of columns in the result set.*/",
+          "getterMethodName" : "getColumnCount",
           "getterModel" : {
-            "returnType" : "java.util.List<SqlStatementResult>",
+            "returnType" : "Long",
             "documentation" : null
           },
           "http" : {
@@ -3018,11 +11183,79 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "sqlStatementResults",
+            "marshallLocationName" : "columnCount",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "sqlStatementResults",
+            "unmarshallLocationName" : "columnCount",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Long",
+          "marshallingType" : "LONG",
+          "name" : "ColumnCount",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@param columnCount The number of columns in the result set.*/",
+          "setterMethodName" : "setColumnCount",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "columnCount",
+            "variableType" : "Long",
+            "documentation" : "",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The number of columns in the result set.</p>\n@param columnCount The number of columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Long",
+            "variableName" : "columnCount",
+            "variableType" : "Long",
+            "documentation" : "<p>The number of columns in the result set.</p>",
+            "simpleType" : "Long",
+            "variableSetterType" : "Long"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ColumnMetadata" : {
+          "c2jName" : "columnMetadata",
+          "c2jShape" : "Metadata",
+          "deprecated" : false,
+          "documentation" : "<p>The metadata of the columns in the result set.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n@param columnMetadata The metadata of the columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withColumnMetadata",
+          "getterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n@return The metadata of the columns in the result set.*/",
+          "getterMethodName" : "getColumnMetadata",
+          "getterModel" : {
+            "returnType" : "java.util.List<ColumnMetadata>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "columnMetadata",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "columnMetadata",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -3034,7 +11267,7 @@
             "interfaceType" : "java.util.List",
             "listMemberModel" : {
               "c2jName" : "member",
-              "c2jShape" : "SqlStatementResult",
+              "c2jShape" : "ColumnMetadata",
               "deprecated" : false,
               "documentation" : "",
               "enumType" : null,
@@ -3043,7 +11276,7 @@
               "getterDocumentation" : "/**\n@return */",
               "getterMethodName" : "getMember",
               "getterModel" : {
-                "returnType" : "SqlStatementResult",
+                "returnType" : "ColumnMetadata",
                 "documentation" : null
               },
               "http" : {
@@ -3078,12 +11311,12 @@
               "setterMethodName" : "setMember",
               "setterModel" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "SqlStatementResult",
+                "variableDeclarationType" : "ColumnMetadata",
                 "variableName" : "member",
-                "variableType" : "SqlStatementResult",
+                "variableType" : "ColumnMetadata",
                 "documentation" : "",
-                "simpleType" : "SqlStatementResult",
-                "variableSetterType" : "SqlStatementResult"
+                "simpleType" : "ColumnMetadata",
+                "variableSetterType" : "ColumnMetadata"
               },
               "shouldEmitLegacyEnumSetter" : false,
               "simple" : false,
@@ -3091,64 +11324,64 @@
               "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
               "variable" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "SqlStatementResult",
+                "variableDeclarationType" : "ColumnMetadata",
                 "variableName" : "member",
-                "variableType" : "SqlStatementResult",
+                "variableType" : "ColumnMetadata",
                 "documentation" : "",
-                "simpleType" : "SqlStatementResult",
-                "variableSetterType" : "SqlStatementResult"
+                "simpleType" : "ColumnMetadata",
+                "variableSetterType" : "ColumnMetadata"
               },
               "xmlNameSpaceUri" : null
             },
             "memberLocationName" : null,
-            "memberType" : "SqlStatementResult",
+            "memberType" : "ColumnMetadata",
             "map" : false,
             "marshallNonAutoConstructedEmptyLists" : false,
             "memberAdditionalMarshallingPath" : null,
             "memberAdditionalUnmarshallingPath" : null,
             "sendEmptyQueryString" : false,
             "simple" : false,
-            "simpleType" : "SqlStatementResult",
-            "templateImplType" : "java.util.ArrayList<SqlStatementResult>",
-            "templateType" : "java.util.List<SqlStatementResult>"
+            "simpleType" : "ColumnMetadata",
+            "templateImplType" : "java.util.ArrayList<ColumnMetadata>",
+            "templateType" : "java.util.List<ColumnMetadata>"
           },
           "map" : false,
           "mapModel" : null,
           "marshallingTargetClass" : "List",
           "marshallingType" : "LIST",
-          "name" : "SqlStatementResults",
+          "name" : "ColumnMetadata",
           "sensitive" : false,
-          "setterDocumentation" : "/**Results returned by executing the sql statement(s)\n@param sqlStatementResults Results returned by executing the sql statement(s)*/",
-          "setterMethodName" : "setSqlStatementResults",
+          "setterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n@param columnMetadata The metadata of the columns in the result set.*/",
+          "setterMethodName" : "setColumnMetadata",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<SqlStatementResult>",
-            "variableName" : "sqlStatementResults",
-            "variableType" : "java.util.List<SqlStatementResult>",
+            "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+            "variableName" : "columnMetadata",
+            "variableType" : "java.util.List<ColumnMetadata>",
             "documentation" : "",
-            "simpleType" : "List<SqlStatementResult>",
-            "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+            "simpleType" : "List<ColumnMetadata>",
+            "variableSetterType" : "java.util.Collection<ColumnMetadata>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Results returned by executing the sql statement(s)\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setSqlStatementResults(java.util.Collection)} or {@link #withSqlStatementResults(java.util.Collection)} if you want to override the existing values.</p>\n@param sqlStatementResults Results returned by executing the sql statement(s)\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The metadata of the columns in the result set.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want to override the existing values.</p>\n@param columnMetadata The metadata of the columns in the result set.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<SqlStatementResult>",
-            "variableName" : "sqlStatementResults",
-            "variableType" : "java.util.List<SqlStatementResult>",
-            "documentation" : "Results returned by executing the sql statement(s)",
-            "simpleType" : "List<SqlStatementResult>",
-            "variableSetterType" : "java.util.Collection<SqlStatementResult>"
+            "variableDeclarationType" : "java.util.List<ColumnMetadata>",
+            "variableName" : "columnMetadata",
+            "variableType" : "java.util.List<ColumnMetadata>",
+            "documentation" : "<p>The metadata of the columns in the result set.</p>",
+            "simpleType" : "List<ColumnMetadata>",
+            "variableSetterType" : "java.util.Collection<ColumnMetadata>"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "sqlStatementResults" ],
-      "shapeName" : "ExecuteSqlResult",
+      "required" : null,
+      "shapeName" : "ResultSetMetadata",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -3157,93 +11390,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ExecuteSqlResult",
-        "variableName" : "executeSqlResult",
-        "variableType" : "ExecuteSqlResult",
-        "documentation" : null,
-        "simpleType" : "ExecuteSqlResult",
-        "variableSetterType" : "ExecuteSqlResult"
-      },
-      "wrapper" : false
-    },
-    "ForbiddenException" : {
-      "c2jName" : "ForbiddenException",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "Access denied exception",
-      "enums" : null,
-      "errorCode" : "ForbiddenException",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : [ ],
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ForbiddenException",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ForbiddenException",
-        "variableName" : "forbiddenException",
-        "variableType" : "ForbiddenException",
-        "documentation" : null,
-        "simpleType" : "ForbiddenException",
-        "variableSetterType" : "ForbiddenException"
-      },
-      "wrapper" : false
-    },
-    "InternalServerErrorException" : {
-      "c2jName" : "InternalServerErrorException",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
-      },
-      "deprecated" : false,
-      "documentation" : "Internal service error",
-      "enums" : null,
-      "errorCode" : "InternalServerErrorException",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "InternalServerErrorException",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : null,
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "InternalServerErrorException",
-        "variableName" : "internalServerErrorException",
-        "variableType" : "InternalServerErrorException",
+        "variableDeclarationType" : "ResultSetMetadata",
+        "variableName" : "resultSetMetadata",
+        "variableType" : "ResultSetMetadata",
         "documentation" : null,
-        "simpleType" : "InternalServerErrorException",
-        "variableSetterType" : "InternalServerErrorException"
+        "simpleType" : "ResultSetMetadata",
+        "variableSetterType" : "ResultSetMetadata"
       },
       "wrapper" : false
     },
-    "Record" : {
-      "c2jName" : "Record",
+    "RollbackTransactionRequest" : {
+      "c2jName" : "RollbackTransactionRequest",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -3251,7 +11408,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Row or Record",
+      "documentation" : "<p>The request parameters represent the input of a request to perform a rollback of a\n            transaction.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -3259,19 +11416,26 @@
       "hasRequiresLengthMember" : false,
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
-      "marshaller" : null,
+      "marshaller" : {
+        "action" : "RollbackTransaction",
+        "locationName" : null,
+        "requestUri" : "/RollbackTransaction",
+        "target" : null,
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
       "members" : [ {
-        "c2jName" : "values",
-        "c2jShape" : "Row",
+        "c2jName" : "resourceArn",
+        "c2jShape" : "Arn",
         "deprecated" : false,
-        "documentation" : "Record",
+        "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Record\n@param values Record\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withValues",
-        "getterDocumentation" : "/**Record\n@return Record*/",
-        "getterMethodName" : "getValues",
+        "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceArn",
+        "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "getterMethodName" : "getResourceArn",
         "getterModel" : {
-          "returnType" : "java.util.List<Value>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -3284,145 +11448,197 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "values",
+          "marshallLocationName" : "resourceArn",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "values",
+          "unmarshallLocationName" : "resourceArn",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "Value",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "Value",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "Value",
-              "variableName" : "member",
-              "variableType" : "Value",
-              "documentation" : "",
-              "simpleType" : "Value",
-              "variableSetterType" : "Value"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "Value",
-              "variableName" : "member",
-              "variableType" : "Value",
-              "documentation" : "",
-              "simpleType" : "Value",
-              "variableSetterType" : "Value"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "Value",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "Value",
-          "templateImplType" : "java.util.ArrayList<Value>",
-          "templateType" : "java.util.List<Value>"
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ResourceArn",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+        "setterMethodName" : "setResourceArn",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "resourceArn",
+          "variableType" : "String",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "secretArn",
+        "c2jShape" : "Arn",
+        "deprecated" : false,
+        "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withSecretArn",
+        "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+        "getterMethodName" : "getSecretArn",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "secretArn",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "secretArn",
+          "uri" : false
         },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "Values",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "SecretArn",
         "sensitive" : false,
-        "setterDocumentation" : "/**Record\n@param values Record*/",
-        "setterMethodName" : "setValues",
+        "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+        "setterMethodName" : "setSecretArn",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Value>",
-          "variableName" : "values",
-          "variableType" : "java.util.List<Value>",
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "List<Value>",
-          "variableSetterType" : "java.util.Collection<Value>"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Record\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setValues(java.util.Collection)} or {@link #withValues(java.util.Collection)} if you want to override the existing values.</p>\n@param values Record\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Value>",
-          "variableName" : "values",
-          "variableType" : "java.util.List<Value>",
-          "documentation" : "Record",
-          "simpleType" : "List<Value>",
-          "variableSetterType" : "java.util.Collection<Value>"
+          "variableDeclarationType" : "String",
+          "variableName" : "secretArn",
+          "variableType" : "String",
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "transactionId",
+        "c2jShape" : "Id",
+        "deprecated" : false,
+        "documentation" : "<p>The identifier of the transaction to roll back.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@param transactionId The identifier of the transaction to roll back.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionId",
+        "getterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@return The identifier of the transaction to roll back.*/",
+        "getterMethodName" : "getTransactionId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "transactionId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "transactionId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@param transactionId The identifier of the transaction to roll back.*/",
+        "setterMethodName" : "setTransactionId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@param transactionId The identifier of the transaction to roll back.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionId",
+          "variableType" : "String",
+          "documentation" : "<p>The identifier of the transaction to roll back.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "Values" : {
-          "c2jName" : "values",
-          "c2jShape" : "Row",
+        "ResourceArn" : {
+          "c2jName" : "resourceArn",
+          "c2jShape" : "Arn",
           "deprecated" : false,
-          "documentation" : "Record",
+          "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Record\n@param values Record\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withValues",
-          "getterDocumentation" : "/**Record\n@return Record*/",
-          "getterMethodName" : "getValues",
+          "fluentSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceArn",
+          "getterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "getterMethodName" : "getResourceArn",
           "getterModel" : {
-            "returnType" : "java.util.List<Value>",
+            "returnType" : "String",
             "documentation" : null
           },
           "http" : {
@@ -3435,156 +11651,207 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "values",
+            "marshallLocationName" : "resourceArn",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "values",
+            "unmarshallLocationName" : "resourceArn",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "Value",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "Value",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Value",
-                "variableName" : "member",
-                "variableType" : "Value",
-                "documentation" : "",
-                "simpleType" : "Value",
-                "variableSetterType" : "Value"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Value",
-                "variableName" : "member",
-                "variableType" : "Value",
-                "documentation" : "",
-                "simpleType" : "Value",
-                "variableSetterType" : "Value"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "Value",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "Value",
-            "templateImplType" : "java.util.ArrayList<Value>",
-            "templateType" : "java.util.List<Value>"
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.*/",
+          "setterMethodName" : "setResourceArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>\n@param resourceArn The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceArn",
+            "variableType" : "String",
+            "documentation" : "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "SecretArn" : {
+          "c2jName" : "secretArn",
+          "c2jShape" : "Arn",
+          "deprecated" : false,
+          "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withSecretArn",
+          "getterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@return The name or ARN of the secret that enables access to the DB cluster.*/",
+          "getterMethodName" : "getSecretArn",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "secretArn",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "secretArn",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "SecretArn",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.*/",
+          "setterMethodName" : "setSecretArn",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name or ARN of the secret that enables access to the DB cluster.</p>\n@param secretArn The name or ARN of the secret that enables access to the DB cluster.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "secretArn",
+            "variableType" : "String",
+            "documentation" : "<p>The name or ARN of the secret that enables access to the DB cluster.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TransactionId" : {
+          "c2jName" : "transactionId",
+          "c2jShape" : "Id",
+          "deprecated" : false,
+          "documentation" : "<p>The identifier of the transaction to roll back.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@param transactionId The identifier of the transaction to roll back.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionId",
+          "getterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@return The identifier of the transaction to roll back.*/",
+          "getterMethodName" : "getTransactionId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionId",
+            "uri" : false
           },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "Values",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionId",
           "sensitive" : false,
-          "setterDocumentation" : "/**Record\n@param values Record*/",
-          "setterMethodName" : "setValues",
+          "setterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@param transactionId The identifier of the transaction to roll back.*/",
+          "setterMethodName" : "setTransactionId",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Value>",
-            "variableName" : "values",
-            "variableType" : "java.util.List<Value>",
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<Value>",
-            "variableSetterType" : "java.util.Collection<Value>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Record\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setValues(java.util.Collection)} or {@link #withValues(java.util.Collection)} if you want to override the existing values.</p>\n@param values Record\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The identifier of the transaction to roll back.</p>\n@param transactionId The identifier of the transaction to roll back.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Value>",
-            "variableName" : "values",
-            "variableType" : "java.util.List<Value>",
-            "documentation" : "Record",
-            "simpleType" : "List<Value>",
-            "variableSetterType" : "java.util.Collection<Value>"
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionId",
+            "variableType" : "String",
+            "documentation" : "<p>The identifier of the transaction to roll back.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "Record",
+      "required" : [ "resourceArn", "secretArn", "transactionId" ],
+      "shapeName" : "RollbackTransactionRequest",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
+      "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "Record",
-        "variableName" : "record",
-        "variableType" : "Record",
+        "variableDeclarationType" : "RollbackTransactionRequest",
+        "variableName" : "rollbackTransactionRequest",
+        "variableType" : "RollbackTransactionRequest",
         "documentation" : null,
-        "simpleType" : "Record",
-        "variableSetterType" : "Record"
+        "simpleType" : "RollbackTransactionRequest",
+        "variableSetterType" : "RollbackTransactionRequest"
       },
       "wrapper" : false
     },
-    "ResultFrame" : {
-      "c2jName" : "ResultFrame",
+    "RollbackTransactionResult" : {
+      "c2jName" : "RollbackTransactionResponse",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -3592,7 +11859,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Result Frame",
+      "documentation" : "<p>The response elements represent the output of a request to perform a rollback of a\n            transaction.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -3602,17 +11869,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "records",
-        "c2jShape" : "Records",
+        "c2jName" : "transactionStatus",
+        "c2jShape" : "TransactionStatus",
         "deprecated" : false,
-        "documentation" : "ResultSet Metadata.",
+        "documentation" : "<p>The status of the rollback operation.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**ResultSet Metadata.\n@param records ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withRecords",
-        "getterDocumentation" : "/**ResultSet Metadata.\n@return ResultSet Metadata.*/",
-        "getterMethodName" : "getRecords",
+        "fluentSetterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@param transactionStatus The status of the rollback operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withTransactionStatus",
+        "getterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@return The status of the rollback operation.*/",
+        "getterMethodName" : "getTransactionStatus",
         "getterModel" : {
-          "returnType" : "java.util.List<Record>",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -3625,143 +11892,276 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "records",
+          "marshallLocationName" : "transactionStatus",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "records",
+          "unmarshallLocationName" : "transactionStatus",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "Record",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "Record",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "Record",
-              "variableName" : "member",
-              "variableType" : "Record",
-              "documentation" : "",
-              "simpleType" : "Record",
-              "variableSetterType" : "Record"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "Record",
-              "variableName" : "member",
-              "variableType" : "Record",
-              "documentation" : "",
-              "simpleType" : "Record",
-              "variableSetterType" : "Record"
-            },
-            "xmlNameSpaceUri" : null
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "TransactionStatus",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@param transactionStatus The status of the rollback operation.*/",
+        "setterMethodName" : "setTransactionStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionStatus",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@param transactionStatus The status of the rollback operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "transactionStatus",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the rollback operation.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "TransactionStatus" : {
+          "c2jName" : "transactionStatus",
+          "c2jShape" : "TransactionStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the rollback operation.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@param transactionStatus The status of the rollback operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTransactionStatus",
+          "getterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@return The status of the rollback operation.*/",
+          "getterMethodName" : "getTransactionStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
           },
-          "memberLocationName" : null,
-          "memberType" : "Record",
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "transactionStatus",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "transactionStatus",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
           "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "Record",
-          "templateImplType" : "java.util.ArrayList<Record>",
-          "templateType" : "java.util.List<Record>"
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TransactionStatus",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@param transactionStatus The status of the rollback operation.*/",
+          "setterMethodName" : "setTransactionStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionStatus",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the rollback operation.</p>\n@param transactionStatus The status of the rollback operation.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "transactionStatus",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the rollback operation.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "RollbackTransactionResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "RollbackTransactionResult",
+        "variableName" : "rollbackTransactionResult",
+        "variableType" : "RollbackTransactionResult",
+        "documentation" : null,
+        "simpleType" : "RollbackTransactionResult",
+        "variableSetterType" : "RollbackTransactionResult"
+      },
+      "wrapper" : false
+    },
+    "ServiceUnavailableErrorException" : {
+      "c2jName" : "ServiceUnavailableError",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
+      "enums" : null,
+      "errorCode" : "ServiceUnavailableError",
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ServiceUnavailableErrorException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ServiceUnavailableErrorException",
+        "variableName" : "serviceUnavailableErrorException",
+        "variableType" : "ServiceUnavailableErrorException",
+        "documentation" : null,
+        "simpleType" : "ServiceUnavailableErrorException",
+        "variableSetterType" : "ServiceUnavailableErrorException"
+      },
+      "wrapper" : false
+    },
+    "SqlParameter" : {
+      "c2jName" : "SqlParameter",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A parameter used in a SQL statement.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "name",
+        "c2jShape" : "ParameterName",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the parameter.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the parameter.</p>\n@param name The name of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withName",
+        "getterDocumentation" : "/**<p>The name of the parameter.</p>\n@return The name of the parameter.*/",
+        "getterMethodName" : "getName",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "name",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "name",
+          "uri" : false
         },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "Records",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Name",
         "sensitive" : false,
-        "setterDocumentation" : "/**ResultSet Metadata.\n@param records ResultSet Metadata.*/",
-        "setterMethodName" : "setRecords",
+        "setterDocumentation" : "/**<p>The name of the parameter.</p>\n@param name The name of the parameter.*/",
+        "setterMethodName" : "setName",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Record>",
-          "variableName" : "records",
-          "variableType" : "java.util.List<Record>",
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "List<Record>",
-          "variableSetterType" : "java.util.Collection<Record>"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
+        "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**ResultSet Metadata.\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override the existing values.</p>\n@param records ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The name of the parameter.</p>\n@param name The name of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Record>",
-          "variableName" : "records",
-          "variableType" : "java.util.List<Record>",
-          "documentation" : "ResultSet Metadata.",
-          "simpleType" : "List<Record>",
-          "variableSetterType" : "java.util.Collection<Record>"
+          "variableDeclarationType" : "String",
+          "variableName" : "name",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the parameter.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "resultSetMetadata",
-        "c2jShape" : "ResultSetMetadata",
+        "c2jName" : "value",
+        "c2jShape" : "Field",
         "deprecated" : false,
-        "documentation" : "ResultSet Metadata.",
+        "documentation" : "<p>The value of the parameter.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**ResultSet Metadata.\n@param resultSetMetadata ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withResultSetMetadata",
-        "getterDocumentation" : "/**ResultSet Metadata.\n@return ResultSet Metadata.*/",
-        "getterMethodName" : "getResultSetMetadata",
+        "fluentSetterDocumentation" : "/**<p>The value of the parameter.</p>\n@param value The value of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withValue",
+        "getterDocumentation" : "/**<p>The value of the parameter.</p>\n@return The value of the parameter.*/",
+        "getterMethodName" : "getValue",
         "getterModel" : {
-          "returnType" : "ResultSetMetadata",
+          "returnType" : "Field",
           "documentation" : null
         },
         "http" : {
@@ -3774,213 +12174,131 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "resultSetMetadata",
+          "marshallLocationName" : "value",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "resultSetMetadata",
+          "unmarshallLocationName" : "value",
           "uri" : false
         },
         "idempotencyToken" : false,
         "isBinary" : false,
         "jsonValue" : false,
         "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "ResultSetMetadata",
-        "sensitive" : false,
-        "setterDocumentation" : "/**ResultSet Metadata.\n@param resultSetMetadata ResultSet Metadata.*/",
-        "setterMethodName" : "setResultSetMetadata",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ResultSetMetadata",
-          "variableName" : "resultSetMetadata",
-          "variableType" : "ResultSetMetadata",
-          "documentation" : "",
-          "simpleType" : "ResultSetMetadata",
-          "variableSetterType" : "ResultSetMetadata"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**ResultSet Metadata.\n@param resultSetMetadata ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ResultSetMetadata",
-          "variableName" : "resultSetMetadata",
-          "variableType" : "ResultSetMetadata",
-          "documentation" : "ResultSet Metadata.",
-          "simpleType" : "ResultSetMetadata",
-          "variableSetterType" : "ResultSetMetadata"
-        },
-        "xmlNameSpaceUri" : null
-      } ],
-      "membersAsMap" : {
-        "Records" : {
-          "c2jName" : "records",
-          "c2jShape" : "Records",
-          "deprecated" : false,
-          "documentation" : "ResultSet Metadata.",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**ResultSet Metadata.\n@param records ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withRecords",
-          "getterDocumentation" : "/**ResultSet Metadata.\n@return ResultSet Metadata.*/",
-          "getterMethodName" : "getRecords",
-          "getterModel" : {
-            "returnType" : "java.util.List<Record>",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "records",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "records",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "Record",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "Record",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Record",
-                "variableName" : "member",
-                "variableType" : "Record",
-                "documentation" : "",
-                "simpleType" : "Record",
-                "variableSetterType" : "Record"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "Record",
-                "variableName" : "member",
-                "variableType" : "Record",
-                "documentation" : "",
-                "simpleType" : "Record",
-                "variableSetterType" : "Record"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "Record",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "Record",
-            "templateImplType" : "java.util.ArrayList<Record>",
-            "templateType" : "java.util.List<Record>"
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "Value",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The value of the parameter.</p>\n@param value The value of the parameter.*/",
+        "setterMethodName" : "setValue",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Field",
+          "variableName" : "value",
+          "variableType" : "Field",
+          "documentation" : "",
+          "simpleType" : "Field",
+          "variableSetterType" : "Field"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The value of the parameter.</p>\n@param value The value of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Field",
+          "variableName" : "value",
+          "variableType" : "Field",
+          "documentation" : "<p>The value of the parameter.</p>",
+          "simpleType" : "Field",
+          "variableSetterType" : "Field"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Name" : {
+          "c2jName" : "name",
+          "c2jShape" : "ParameterName",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the parameter.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the parameter.</p>\n@param name The name of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withName",
+          "getterDocumentation" : "/**<p>The name of the parameter.</p>\n@return The name of the parameter.*/",
+          "getterMethodName" : "getName",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "name",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "name",
+            "uri" : false
           },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "Records",
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Name",
           "sensitive" : false,
-          "setterDocumentation" : "/**ResultSet Metadata.\n@param records ResultSet Metadata.*/",
-          "setterMethodName" : "setRecords",
+          "setterDocumentation" : "/**<p>The name of the parameter.</p>\n@param name The name of the parameter.*/",
+          "setterMethodName" : "setName",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Record>",
-            "variableName" : "records",
-            "variableType" : "java.util.List<Record>",
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
             "documentation" : "",
-            "simpleType" : "List<Record>",
-            "variableSetterType" : "java.util.Collection<Record>"
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "shouldEmitLegacyEnumSetter" : false,
-          "simple" : false,
+          "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**ResultSet Metadata.\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override the existing values.</p>\n@param records ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The name of the parameter.</p>\n@param name The name of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Record>",
-            "variableName" : "records",
-            "variableType" : "java.util.List<Record>",
-            "documentation" : "ResultSet Metadata.",
-            "simpleType" : "List<Record>",
-            "variableSetterType" : "java.util.Collection<Record>"
+            "variableDeclarationType" : "String",
+            "variableName" : "name",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the parameter.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "ResultSetMetadata" : {
-          "c2jName" : "resultSetMetadata",
-          "c2jShape" : "ResultSetMetadata",
+        "Value" : {
+          "c2jName" : "value",
+          "c2jShape" : "Field",
           "deprecated" : false,
-          "documentation" : "ResultSet Metadata.",
+          "documentation" : "<p>The value of the parameter.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**ResultSet Metadata.\n@param resultSetMetadata ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResultSetMetadata",
-          "getterDocumentation" : "/**ResultSet Metadata.\n@return ResultSet Metadata.*/",
-          "getterMethodName" : "getResultSetMetadata",
+          "fluentSetterDocumentation" : "/**<p>The value of the parameter.</p>\n@param value The value of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withValue",
+          "getterDocumentation" : "/**<p>The value of the parameter.</p>\n@return The value of the parameter.*/",
+          "getterMethodName" : "getValue",
           "getterModel" : {
-            "returnType" : "ResultSetMetadata",
+            "returnType" : "Field",
             "documentation" : null
           },
           "http" : {
@@ -3993,11 +12311,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "resultSetMetadata",
+            "marshallLocationName" : "value",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "resultSetMetadata",
+            "unmarshallLocationName" : "value",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -4009,31 +12327,31 @@
           "mapModel" : null,
           "marshallingTargetClass" : "StructuredPojo",
           "marshallingType" : "STRUCTURED",
-          "name" : "ResultSetMetadata",
+          "name" : "Value",
           "sensitive" : false,
-          "setterDocumentation" : "/**ResultSet Metadata.\n@param resultSetMetadata ResultSet Metadata.*/",
-          "setterMethodName" : "setResultSetMetadata",
+          "setterDocumentation" : "/**<p>The value of the parameter.</p>\n@param value The value of the parameter.*/",
+          "setterMethodName" : "setValue",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ResultSetMetadata",
-            "variableName" : "resultSetMetadata",
-            "variableType" : "ResultSetMetadata",
+            "variableDeclarationType" : "Field",
+            "variableName" : "value",
+            "variableType" : "Field",
             "documentation" : "",
-            "simpleType" : "ResultSetMetadata",
-            "variableSetterType" : "ResultSetMetadata"
+            "simpleType" : "Field",
+            "variableSetterType" : "Field"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**ResultSet Metadata.\n@param resultSetMetadata ResultSet Metadata.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The value of the parameter.</p>\n@param value The value of the parameter.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ResultSetMetadata",
-            "variableName" : "resultSetMetadata",
-            "variableType" : "ResultSetMetadata",
-            "documentation" : "ResultSet Metadata.",
-            "simpleType" : "ResultSetMetadata",
-            "variableSetterType" : "ResultSetMetadata"
+            "variableDeclarationType" : "Field",
+            "variableName" : "value",
+            "variableType" : "Field",
+            "documentation" : "<p>The value of the parameter.</p>",
+            "simpleType" : "Field",
+            "variableSetterType" : "Field"
           },
           "xmlNameSpaceUri" : null
         }
@@ -4041,7 +12359,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ResultFrame",
+      "shapeName" : "SqlParameter",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -4050,17 +12368,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ResultFrame",
-        "variableName" : "resultFrame",
-        "variableType" : "ResultFrame",
+        "variableDeclarationType" : "SqlParameter",
+        "variableName" : "sqlParameter",
+        "variableType" : "SqlParameter",
         "documentation" : null,
-        "simpleType" : "ResultFrame",
-        "variableSetterType" : "ResultFrame"
+        "simpleType" : "SqlParameter",
+        "variableSetterType" : "SqlParameter"
       },
       "wrapper" : false
     },
-    "ResultSetMetadata" : {
-      "c2jName" : "ResultSetMetadata",
+    "SqlStatementResult" : {
+      "c2jName" : "SqlStatementResult",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -4068,7 +12386,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "List of columns and their types.",
+      "documentation" : "<p>The result of a SQL statement.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -4078,15 +12396,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "columnCount",
-        "c2jShape" : "Long",
+        "c2jName" : "numberOfRecordsUpdated",
+        "c2jShape" : "RecordsUpdated",
         "deprecated" : false,
-        "documentation" : "Number of columns",
+        "documentation" : "<p>The number of records updated by a SQL statement.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Number of columns\n@param columnCount Number of columns\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withColumnCount",
-        "getterDocumentation" : "/**Number of columns\n@return Number of columns*/",
-        "getterMethodName" : "getColumnCount",
+        "fluentSetterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@param numberOfRecordsUpdated The number of records updated by a SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNumberOfRecordsUpdated",
+        "getterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@return The number of records updated by a SQL statement.*/",
+        "getterMethodName" : "getNumberOfRecordsUpdated",
         "getterModel" : {
           "returnType" : "Long",
           "documentation" : null
@@ -4101,11 +12419,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "columnCount",
+          "marshallLocationName" : "numberOfRecordsUpdated",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "columnCount",
+          "unmarshallLocationName" : "numberOfRecordsUpdated",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -4117,194 +12435,112 @@
         "mapModel" : null,
         "marshallingTargetClass" : "Long",
         "marshallingType" : "LONG",
-        "name" : "ColumnCount",
+        "name" : "NumberOfRecordsUpdated",
         "sensitive" : false,
-        "setterDocumentation" : "/**Number of columns\n@param columnCount Number of columns*/",
-        "setterMethodName" : "setColumnCount",
+        "setterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@param numberOfRecordsUpdated The number of records updated by a SQL statement.*/",
+        "setterMethodName" : "setNumberOfRecordsUpdated",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Long",
-          "variableName" : "columnCount",
-          "variableType" : "Long",
-          "documentation" : "",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Number of columns\n@param columnCount Number of columns\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "Long",
-          "variableName" : "columnCount",
+          "variableName" : "numberOfRecordsUpdated",
           "variableType" : "Long",
-          "documentation" : "Number of columns",
-          "simpleType" : "Long",
-          "variableSetterType" : "Long"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "columnMetadata",
-        "c2jShape" : "ColumnMetadataList",
-        "deprecated" : false,
-        "documentation" : "List of columns and their types",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**List of columns and their types\n@param columnMetadata List of columns and their types\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withColumnMetadata",
-        "getterDocumentation" : "/**List of columns and their types\n@return List of columns and their types*/",
-        "getterMethodName" : "getColumnMetadata",
-        "getterModel" : {
-          "returnType" : "java.util.List<ColumnMetadata>",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "columnMetadata",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "columnMetadata",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : true,
-        "listModel" : {
-          "implType" : "java.util.ArrayList",
-          "interfaceType" : "java.util.List",
-          "listMemberModel" : {
-            "c2jName" : "member",
-            "c2jShape" : "ColumnMetadata",
-            "deprecated" : false,
-            "documentation" : "",
-            "enumType" : null,
-            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "fluentSetterMethodName" : "withMember",
-            "getterDocumentation" : "/**\n@return */",
-            "getterMethodName" : "getMember",
-            "getterModel" : {
-              "returnType" : "ColumnMetadata",
-              "documentation" : null
-            },
-            "http" : {
-              "additionalMarshallingPath" : null,
-              "additionalUnmarshallingPath" : null,
-              "flattened" : false,
-              "greedy" : false,
-              "header" : false,
-              "isPayload" : false,
-              "isStreaming" : false,
-              "location" : null,
-              "marshallLocation" : "PAYLOAD",
-              "marshallLocationName" : "member",
-              "queryString" : false,
-              "requiresLength" : false,
-              "statusCode" : false,
-              "unmarshallLocationName" : "member",
-              "uri" : false
-            },
-            "idempotencyToken" : false,
-            "isBinary" : false,
-            "jsonValue" : false,
-            "list" : false,
-            "listModel" : null,
-            "map" : false,
-            "mapModel" : null,
-            "marshallingTargetClass" : "StructuredPojo",
-            "marshallingType" : "STRUCTURED",
-            "name" : "Member",
-            "sensitive" : false,
-            "setterDocumentation" : "/**\n@param member */",
-            "setterMethodName" : "setMember",
-            "setterModel" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "ColumnMetadata",
-              "variableName" : "member",
-              "variableType" : "ColumnMetadata",
-              "documentation" : "",
-              "simpleType" : "ColumnMetadata",
-              "variableSetterType" : "ColumnMetadata"
-            },
-            "shouldEmitLegacyEnumSetter" : false,
-            "simple" : false,
-            "unmarshallingType" : null,
-            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-            "variable" : {
-              "timestampFormat" : null,
-              "variableDeclarationType" : "ColumnMetadata",
-              "variableName" : "member",
-              "variableType" : "ColumnMetadata",
-              "documentation" : "",
-              "simpleType" : "ColumnMetadata",
-              "variableSetterType" : "ColumnMetadata"
-            },
-            "xmlNameSpaceUri" : null
-          },
-          "memberLocationName" : null,
-          "memberType" : "ColumnMetadata",
-          "map" : false,
-          "marshallNonAutoConstructedEmptyLists" : false,
-          "memberAdditionalMarshallingPath" : null,
-          "memberAdditionalUnmarshallingPath" : null,
-          "sendEmptyQueryString" : false,
-          "simple" : false,
-          "simpleType" : "ColumnMetadata",
-          "templateImplType" : "java.util.ArrayList<ColumnMetadata>",
-          "templateType" : "java.util.List<ColumnMetadata>"
+          "documentation" : "",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@param numberOfRecordsUpdated The number of records updated by a SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Long",
+          "variableName" : "numberOfRecordsUpdated",
+          "variableType" : "Long",
+          "documentation" : "<p>The number of records updated by a SQL statement.</p>",
+          "simpleType" : "Long",
+          "variableSetterType" : "Long"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "resultFrame",
+        "c2jShape" : "ResultFrame",
+        "deprecated" : false,
+        "documentation" : "<p>The result set of the SQL statement.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@param resultFrame The result set of the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResultFrame",
+        "getterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@return The result set of the SQL statement.*/",
+        "getterMethodName" : "getResultFrame",
+        "getterModel" : {
+          "returnType" : "ResultFrame",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "resultFrame",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "resultFrame",
+          "uri" : false
         },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "List",
-        "marshallingType" : "LIST",
-        "name" : "ColumnMetadata",
+        "marshallingTargetClass" : "StructuredPojo",
+        "marshallingType" : "STRUCTURED",
+        "name" : "ResultFrame",
         "sensitive" : false,
-        "setterDocumentation" : "/**List of columns and their types\n@param columnMetadata List of columns and their types*/",
-        "setterMethodName" : "setColumnMetadata",
+        "setterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@param resultFrame The result set of the SQL statement.*/",
+        "setterMethodName" : "setResultFrame",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ColumnMetadata>",
-          "variableName" : "columnMetadata",
-          "variableType" : "java.util.List<ColumnMetadata>",
+          "variableDeclarationType" : "ResultFrame",
+          "variableName" : "resultFrame",
+          "variableType" : "ResultFrame",
           "documentation" : "",
-          "simpleType" : "List<ColumnMetadata>",
-          "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+          "simpleType" : "ResultFrame",
+          "variableSetterType" : "ResultFrame"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**List of columns and their types\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want to override the existing values.</p>\n@param columnMetadata List of columns and their types\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@param resultFrame The result set of the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ColumnMetadata>",
-          "variableName" : "columnMetadata",
-          "variableType" : "java.util.List<ColumnMetadata>",
-          "documentation" : "List of columns and their types",
-          "simpleType" : "List<ColumnMetadata>",
-          "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+          "variableDeclarationType" : "ResultFrame",
+          "variableName" : "resultFrame",
+          "variableType" : "ResultFrame",
+          "documentation" : "<p>The result set of the SQL statement.</p>",
+          "simpleType" : "ResultFrame",
+          "variableSetterType" : "ResultFrame"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "ColumnCount" : {
-          "c2jName" : "columnCount",
-          "c2jShape" : "Long",
+        "NumberOfRecordsUpdated" : {
+          "c2jName" : "numberOfRecordsUpdated",
+          "c2jShape" : "RecordsUpdated",
           "deprecated" : false,
-          "documentation" : "Number of columns",
+          "documentation" : "<p>The number of records updated by a SQL statement.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Number of columns\n@param columnCount Number of columns\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withColumnCount",
-          "getterDocumentation" : "/**Number of columns\n@return Number of columns*/",
-          "getterMethodName" : "getColumnCount",
+          "fluentSetterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@param numberOfRecordsUpdated The number of records updated by a SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNumberOfRecordsUpdated",
+          "getterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@return The number of records updated by a SQL statement.*/",
+          "getterMethodName" : "getNumberOfRecordsUpdated",
           "getterModel" : {
             "returnType" : "Long",
             "documentation" : null
@@ -4319,11 +12555,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "columnCount",
+            "marshallLocationName" : "numberOfRecordsUpdated",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "columnCount",
+            "unmarshallLocationName" : "numberOfRecordsUpdated",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -4335,14 +12571,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "Long",
           "marshallingType" : "LONG",
-          "name" : "ColumnCount",
+          "name" : "NumberOfRecordsUpdated",
           "sensitive" : false,
-          "setterDocumentation" : "/**Number of columns\n@param columnCount Number of columns*/",
-          "setterMethodName" : "setColumnCount",
+          "setterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@param numberOfRecordsUpdated The number of records updated by a SQL statement.*/",
+          "setterMethodName" : "setNumberOfRecordsUpdated",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Long",
-            "variableName" : "columnCount",
+            "variableName" : "numberOfRecordsUpdated",
             "variableType" : "Long",
             "documentation" : "",
             "simpleType" : "Long",
@@ -4351,30 +12587,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Number of columns\n@param columnCount Number of columns\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The number of records updated by a SQL statement.</p>\n@param numberOfRecordsUpdated The number of records updated by a SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Long",
-            "variableName" : "columnCount",
+            "variableName" : "numberOfRecordsUpdated",
             "variableType" : "Long",
-            "documentation" : "Number of columns",
+            "documentation" : "<p>The number of records updated by a SQL statement.</p>",
             "simpleType" : "Long",
             "variableSetterType" : "Long"
           },
           "xmlNameSpaceUri" : null
         },
-        "ColumnMetadata" : {
-          "c2jName" : "columnMetadata",
-          "c2jShape" : "ColumnMetadataList",
+        "ResultFrame" : {
+          "c2jName" : "resultFrame",
+          "c2jShape" : "ResultFrame",
           "deprecated" : false,
-          "documentation" : "List of columns and their types",
+          "documentation" : "<p>The result set of the SQL statement.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**List of columns and their types\n@param columnMetadata List of columns and their types\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withColumnMetadata",
-          "getterDocumentation" : "/**List of columns and their types\n@return List of columns and their types*/",
-          "getterMethodName" : "getColumnMetadata",
+          "fluentSetterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@param resultFrame The result set of the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResultFrame",
+          "getterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@return The result set of the SQL statement.*/",
+          "getterMethodName" : "getResultFrame",
           "getterModel" : {
-            "returnType" : "java.util.List<ColumnMetadata>",
+            "returnType" : "ResultFrame",
             "documentation" : null
           },
           "http" : {
@@ -4387,194 +12623,74 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "columnMetadata",
+            "marshallLocationName" : "resultFrame",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "columnMetadata",
+            "unmarshallLocationName" : "resultFrame",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : true,
-          "listModel" : {
-            "implType" : "java.util.ArrayList",
-            "interfaceType" : "java.util.List",
-            "listMemberModel" : {
-              "c2jName" : "member",
-              "c2jShape" : "ColumnMetadata",
-              "deprecated" : false,
-              "documentation" : "",
-              "enumType" : null,
-              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "fluentSetterMethodName" : "withMember",
-              "getterDocumentation" : "/**\n@return */",
-              "getterMethodName" : "getMember",
-              "getterModel" : {
-                "returnType" : "ColumnMetadata",
-                "documentation" : null
-              },
-              "http" : {
-                "additionalMarshallingPath" : null,
-                "additionalUnmarshallingPath" : null,
-                "flattened" : false,
-                "greedy" : false,
-                "header" : false,
-                "isPayload" : false,
-                "isStreaming" : false,
-                "location" : null,
-                "marshallLocation" : "PAYLOAD",
-                "marshallLocationName" : "member",
-                "queryString" : false,
-                "requiresLength" : false,
-                "statusCode" : false,
-                "unmarshallLocationName" : "member",
-                "uri" : false
-              },
-              "idempotencyToken" : false,
-              "isBinary" : false,
-              "jsonValue" : false,
-              "list" : false,
-              "listModel" : null,
-              "map" : false,
-              "mapModel" : null,
-              "marshallingTargetClass" : "StructuredPojo",
-              "marshallingType" : "STRUCTURED",
-              "name" : "Member",
-              "sensitive" : false,
-              "setterDocumentation" : "/**\n@param member */",
-              "setterMethodName" : "setMember",
-              "setterModel" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "ColumnMetadata",
-                "variableName" : "member",
-                "variableType" : "ColumnMetadata",
-                "documentation" : "",
-                "simpleType" : "ColumnMetadata",
-                "variableSetterType" : "ColumnMetadata"
-              },
-              "shouldEmitLegacyEnumSetter" : false,
-              "simple" : false,
-              "unmarshallingType" : null,
-              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
-              "variable" : {
-                "timestampFormat" : null,
-                "variableDeclarationType" : "ColumnMetadata",
-                "variableName" : "member",
-                "variableType" : "ColumnMetadata",
-                "documentation" : "",
-                "simpleType" : "ColumnMetadata",
-                "variableSetterType" : "ColumnMetadata"
-              },
-              "xmlNameSpaceUri" : null
-            },
-            "memberLocationName" : null,
-            "memberType" : "ColumnMetadata",
-            "map" : false,
-            "marshallNonAutoConstructedEmptyLists" : false,
-            "memberAdditionalMarshallingPath" : null,
-            "memberAdditionalUnmarshallingPath" : null,
-            "sendEmptyQueryString" : false,
-            "simple" : false,
-            "simpleType" : "ColumnMetadata",
-            "templateImplType" : "java.util.ArrayList<ColumnMetadata>",
-            "templateType" : "java.util.List<ColumnMetadata>"
-          },
+          "list" : false,
+          "listModel" : null,
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "List",
-          "marshallingType" : "LIST",
-          "name" : "ColumnMetadata",
+          "marshallingTargetClass" : "StructuredPojo",
+          "marshallingType" : "STRUCTURED",
+          "name" : "ResultFrame",
           "sensitive" : false,
-          "setterDocumentation" : "/**List of columns and their types\n@param columnMetadata List of columns and their types*/",
-          "setterMethodName" : "setColumnMetadata",
+          "setterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@param resultFrame The result set of the SQL statement.*/",
+          "setterMethodName" : "setResultFrame",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ColumnMetadata>",
-            "variableName" : "columnMetadata",
-            "variableType" : "java.util.List<ColumnMetadata>",
+            "variableDeclarationType" : "ResultFrame",
+            "variableName" : "resultFrame",
+            "variableType" : "ResultFrame",
             "documentation" : "",
-            "simpleType" : "List<ColumnMetadata>",
-            "variableSetterType" : "java.util.Collection<ColumnMetadata>"
+            "simpleType" : "ResultFrame",
+            "variableSetterType" : "ResultFrame"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**List of columns and their types\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want to override the existing values.</p>\n@param columnMetadata List of columns and their types\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The result set of the SQL statement.</p>\n@param resultFrame The result set of the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ColumnMetadata>",
-            "variableName" : "columnMetadata",
-            "variableType" : "java.util.List<ColumnMetadata>",
-            "documentation" : "List of columns and their types",
-            "simpleType" : "List<ColumnMetadata>",
-            "variableSetterType" : "java.util.Collection<ColumnMetadata>"
-          },
-          "xmlNameSpaceUri" : null
-        }
-      },
-      "requestSignerAware" : false,
-      "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ResultSetMetadata",
-      "signerAware" : false,
-      "signerType" : null,
-      "unmarshaller" : {
-        "flattened" : false,
-        "resultWrapper" : null
-      },
-      "variable" : {
-        "timestampFormat" : null,
-        "variableDeclarationType" : "ResultSetMetadata",
-        "variableName" : "resultSetMetadata",
-        "variableType" : "ResultSetMetadata",
-        "documentation" : null,
-        "simpleType" : "ResultSetMetadata",
-        "variableSetterType" : "ResultSetMetadata"
-      },
-      "wrapper" : false
-    },
-    "ServiceUnavailableErrorException" : {
-      "c2jName" : "ServiceUnavailableError",
-      "customization" : {
-        "artificialResultWrapper" : null,
-        "skipGeneratingMarshaller" : false,
-        "skipGeneratingModelClass" : false,
-        "skipGeneratingUnmarshaller" : false
+            "variableDeclarationType" : "ResultFrame",
+            "variableName" : "resultFrame",
+            "variableType" : "ResultFrame",
+            "documentation" : "<p>The result set of the SQL statement.</p>",
+            "simpleType" : "ResultFrame",
+            "variableSetterType" : "ResultFrame"
+          },
+          "xmlNameSpaceUri" : null
+        }
       },
-      "deprecated" : false,
-      "documentation" : "Internal service unavailable error",
-      "enums" : null,
-      "errorCode" : "ServiceUnavailableError",
-      "hasHeaderMember" : false,
-      "hasPayloadMember" : false,
-      "hasRequiresLengthMember" : false,
-      "hasStatusCodeMember" : false,
-      "hasStreamingMember" : false,
-      "marshaller" : null,
-      "members" : null,
-      "membersAsMap" : { },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ServiceUnavailableErrorException",
+      "shapeName" : "SqlStatementResult",
       "signerAware" : false,
       "signerType" : null,
-      "unmarshaller" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ServiceUnavailableErrorException",
-        "variableName" : "serviceUnavailableErrorException",
-        "variableType" : "ServiceUnavailableErrorException",
+        "variableDeclarationType" : "SqlStatementResult",
+        "variableName" : "sqlStatementResult",
+        "variableType" : "SqlStatementResult",
         "documentation" : null,
-        "simpleType" : "ServiceUnavailableErrorException",
-        "variableSetterType" : "ServiceUnavailableErrorException"
+        "simpleType" : "SqlStatementResult",
+        "variableSetterType" : "SqlStatementResult"
       },
       "wrapper" : false
     },
-    "SqlStatementResult" : {
-      "c2jName" : "SqlStatementResult",
+    "StatementTimeoutException" : {
+      "c2jName" : "StatementTimeoutException",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -4582,9 +12698,9 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "SQL statement execution result",
+      "documentation" : "<p>The execution of the SQL statement timed out.</p>",
       "enums" : null,
-      "errorCode" : null,
+      "errorCode" : "StatementTimeoutException",
       "hasHeaderMember" : false,
       "hasPayloadMember" : false,
       "hasRequiresLengthMember" : false,
@@ -4592,15 +12708,15 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "numberOfRecordsUpdated",
+        "c2jName" : "dbConnectionId",
         "c2jShape" : "Long",
         "deprecated" : false,
-        "documentation" : "Number of rows updated.",
+        "documentation" : "<p>The database connection ID that executed the SQL statement.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Number of rows updated.\n@param numberOfRecordsUpdated Number of rows updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withNumberOfRecordsUpdated",
-        "getterDocumentation" : "/**Number of rows updated.\n@return Number of rows updated.*/",
-        "getterMethodName" : "getNumberOfRecordsUpdated",
+        "fluentSetterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@param dbConnectionId The database connection ID that executed the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withDbConnectionId",
+        "getterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@return The database connection ID that executed the SQL statement.*/",
+        "getterMethodName" : "getDbConnectionId",
         "getterModel" : {
           "returnType" : "Long",
           "documentation" : null
@@ -4615,11 +12731,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "numberOfRecordsUpdated",
+          "marshallLocationName" : "dbConnectionId",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "numberOfRecordsUpdated",
+          "unmarshallLocationName" : "dbConnectionId",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -4631,14 +12747,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "Long",
         "marshallingType" : "LONG",
-        "name" : "NumberOfRecordsUpdated",
+        "name" : "DbConnectionId",
         "sensitive" : false,
-        "setterDocumentation" : "/**Number of rows updated.\n@param numberOfRecordsUpdated Number of rows updated.*/",
-        "setterMethodName" : "setNumberOfRecordsUpdated",
+        "setterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@param dbConnectionId The database connection ID that executed the SQL statement.*/",
+        "setterMethodName" : "setDbConnectionId",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Long",
-          "variableName" : "numberOfRecordsUpdated",
+          "variableName" : "dbConnectionId",
           "variableType" : "Long",
           "documentation" : "",
           "simpleType" : "Long",
@@ -4647,96 +12763,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Number of rows updated.\n@param numberOfRecordsUpdated Number of rows updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@param dbConnectionId The database connection ID that executed the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Long",
-          "variableName" : "numberOfRecordsUpdated",
+          "variableName" : "dbConnectionId",
           "variableType" : "Long",
-          "documentation" : "Number of rows updated.",
+          "documentation" : "<p>The database connection ID that executed the SQL statement.</p>",
           "simpleType" : "Long",
           "variableSetterType" : "Long"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "resultFrame",
-        "c2jShape" : "ResultFrame",
-        "deprecated" : false,
-        "documentation" : "ResultFrame returned by executing the sql statement",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@param resultFrame ResultFrame returned by executing the sql statement\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withResultFrame",
-        "getterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@return ResultFrame returned by executing the sql statement*/",
-        "getterMethodName" : "getResultFrame",
-        "getterModel" : {
-          "returnType" : "ResultFrame",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "resultFrame",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "resultFrame",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "StructuredPojo",
-        "marshallingType" : "STRUCTURED",
-        "name" : "ResultFrame",
-        "sensitive" : false,
-        "setterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@param resultFrame ResultFrame returned by executing the sql statement*/",
-        "setterMethodName" : "setResultFrame",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ResultFrame",
-          "variableName" : "resultFrame",
-          "variableType" : "ResultFrame",
-          "documentation" : "",
-          "simpleType" : "ResultFrame",
-          "variableSetterType" : "ResultFrame"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : false,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@param resultFrame ResultFrame returned by executing the sql statement\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "ResultFrame",
-          "variableName" : "resultFrame",
-          "variableType" : "ResultFrame",
-          "documentation" : "ResultFrame returned by executing the sql statement",
-          "simpleType" : "ResultFrame",
-          "variableSetterType" : "ResultFrame"
-        },
-        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "NumberOfRecordsUpdated" : {
-          "c2jName" : "numberOfRecordsUpdated",
+        "DbConnectionId" : {
+          "c2jName" : "dbConnectionId",
           "c2jShape" : "Long",
           "deprecated" : false,
-          "documentation" : "Number of rows updated.",
+          "documentation" : "<p>The database connection ID that executed the SQL statement.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Number of rows updated.\n@param numberOfRecordsUpdated Number of rows updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withNumberOfRecordsUpdated",
-          "getterDocumentation" : "/**Number of rows updated.\n@return Number of rows updated.*/",
-          "getterMethodName" : "getNumberOfRecordsUpdated",
+          "fluentSetterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@param dbConnectionId The database connection ID that executed the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withDbConnectionId",
+          "getterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@return The database connection ID that executed the SQL statement.*/",
+          "getterMethodName" : "getDbConnectionId",
           "getterModel" : {
             "returnType" : "Long",
             "documentation" : null
@@ -4751,11 +12800,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "numberOfRecordsUpdated",
+            "marshallLocationName" : "dbConnectionId",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "numberOfRecordsUpdated",
+            "unmarshallLocationName" : "dbConnectionId",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -4767,14 +12816,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "Long",
           "marshallingType" : "LONG",
-          "name" : "NumberOfRecordsUpdated",
+          "name" : "DbConnectionId",
           "sensitive" : false,
-          "setterDocumentation" : "/**Number of rows updated.\n@param numberOfRecordsUpdated Number of rows updated.*/",
-          "setterMethodName" : "setNumberOfRecordsUpdated",
+          "setterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@param dbConnectionId The database connection ID that executed the SQL statement.*/",
+          "setterMethodName" : "setDbConnectionId",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Long",
-            "variableName" : "numberOfRecordsUpdated",
+            "variableName" : "dbConnectionId",
             "variableType" : "Long",
             "documentation" : "",
             "simpleType" : "Long",
@@ -4783,30 +12832,218 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Number of rows updated.\n@param numberOfRecordsUpdated Number of rows updated.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The database connection ID that executed the SQL statement.</p>\n@param dbConnectionId The database connection ID that executed the SQL statement.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Long",
-            "variableName" : "numberOfRecordsUpdated",
+            "variableName" : "dbConnectionId",
             "variableType" : "Long",
-            "documentation" : "Number of rows updated.",
+            "documentation" : "<p>The database connection ID that executed the SQL statement.</p>",
             "simpleType" : "Long",
             "variableSetterType" : "Long"
           },
           "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "StatementTimeoutException",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StatementTimeoutException",
+        "variableName" : "statementTimeoutException",
+        "variableType" : "StatementTimeoutException",
+        "documentation" : null,
+        "simpleType" : "StatementTimeoutException",
+        "variableSetterType" : "StatementTimeoutException"
+      },
+      "wrapper" : false
+    },
+    "StructValue" : {
+      "c2jName" : "StructValue",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>A structure value returned by a call.</p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "attributes",
+        "c2jShape" : "ArrayValueList",
+        "deprecated" : false,
+        "documentation" : "<p>The attributes returned in the record.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The attributes returned in the record.</p>\n@param attributes The attributes returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAttributes",
+        "getterDocumentation" : "/**<p>The attributes returned in the record.</p>\n@return The attributes returned in the record.*/",
+        "getterMethodName" : "getAttributes",
+        "getterModel" : {
+          "returnType" : "java.util.List<Value>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "attributes",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "attributes",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "Value",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "Value",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Value",
+              "variableName" : "member",
+              "variableType" : "Value",
+              "documentation" : "",
+              "simpleType" : "Value",
+              "variableSetterType" : "Value"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "Value",
+              "variableName" : "member",
+              "variableType" : "Value",
+              "documentation" : "",
+              "simpleType" : "Value",
+              "variableSetterType" : "Value"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "Value",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "Value",
+          "templateImplType" : "java.util.ArrayList<Value>",
+          "templateType" : "java.util.List<Value>"
         },
-        "ResultFrame" : {
-          "c2jName" : "resultFrame",
-          "c2jShape" : "ResultFrame",
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "Attributes",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The attributes returned in the record.</p>\n@param attributes The attributes returned in the record.*/",
+        "setterMethodName" : "setAttributes",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Value>",
+          "variableName" : "attributes",
+          "variableType" : "java.util.List<Value>",
+          "documentation" : "",
+          "simpleType" : "List<Value>",
+          "variableSetterType" : "java.util.Collection<Value>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The attributes returned in the record.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to override the existing values.</p>\n@param attributes The attributes returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<Value>",
+          "variableName" : "attributes",
+          "variableType" : "java.util.List<Value>",
+          "documentation" : "<p>The attributes returned in the record.</p>",
+          "simpleType" : "List<Value>",
+          "variableSetterType" : "java.util.Collection<Value>"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Attributes" : {
+          "c2jName" : "attributes",
+          "c2jShape" : "ArrayValueList",
           "deprecated" : false,
-          "documentation" : "ResultFrame returned by executing the sql statement",
+          "documentation" : "<p>The attributes returned in the record.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@param resultFrame ResultFrame returned by executing the sql statement\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResultFrame",
-          "getterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@return ResultFrame returned by executing the sql statement*/",
-          "getterMethodName" : "getResultFrame",
+          "fluentSetterDocumentation" : "/**<p>The attributes returned in the record.</p>\n@param attributes The attributes returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAttributes",
+          "getterDocumentation" : "/**<p>The attributes returned in the record.</p>\n@return The attributes returned in the record.*/",
+          "getterMethodName" : "getAttributes",
           "getterModel" : {
-            "returnType" : "ResultFrame",
+            "returnType" : "java.util.List<Value>",
             "documentation" : null
           },
           "http" : {
@@ -4819,47 +13056,129 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "resultFrame",
+            "marshallLocationName" : "attributes",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "resultFrame",
+            "unmarshallLocationName" : "attributes",
             "uri" : false
           },
           "idempotencyToken" : false,
           "isBinary" : false,
           "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "Value",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "Value",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Value",
+                "variableName" : "member",
+                "variableType" : "Value",
+                "documentation" : "",
+                "simpleType" : "Value",
+                "variableSetterType" : "Value"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "Value",
+                "variableName" : "member",
+                "variableType" : "Value",
+                "documentation" : "",
+                "simpleType" : "Value",
+                "variableSetterType" : "Value"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "Value",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "Value",
+            "templateImplType" : "java.util.ArrayList<Value>",
+            "templateType" : "java.util.List<Value>"
+          },
           "map" : false,
           "mapModel" : null,
-          "marshallingTargetClass" : "StructuredPojo",
-          "marshallingType" : "STRUCTURED",
-          "name" : "ResultFrame",
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "Attributes",
           "sensitive" : false,
-          "setterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@param resultFrame ResultFrame returned by executing the sql statement*/",
-          "setterMethodName" : "setResultFrame",
+          "setterDocumentation" : "/**<p>The attributes returned in the record.</p>\n@param attributes The attributes returned in the record.*/",
+          "setterMethodName" : "setAttributes",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ResultFrame",
-            "variableName" : "resultFrame",
-            "variableType" : "ResultFrame",
+            "variableDeclarationType" : "java.util.List<Value>",
+            "variableName" : "attributes",
+            "variableType" : "java.util.List<Value>",
             "documentation" : "",
-            "simpleType" : "ResultFrame",
-            "variableSetterType" : "ResultFrame"
+            "simpleType" : "List<Value>",
+            "variableSetterType" : "java.util.Collection<Value>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**ResultFrame returned by executing the sql statement\n@param resultFrame ResultFrame returned by executing the sql statement\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The attributes returned in the record.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to override the existing values.</p>\n@param attributes The attributes returned in the record.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "ResultFrame",
-            "variableName" : "resultFrame",
-            "variableType" : "ResultFrame",
-            "documentation" : "ResultFrame returned by executing the sql statement",
-            "simpleType" : "ResultFrame",
-            "variableSetterType" : "ResultFrame"
+            "variableDeclarationType" : "java.util.List<Value>",
+            "variableName" : "attributes",
+            "variableType" : "java.util.List<Value>",
+            "documentation" : "<p>The attributes returned in the record.</p>",
+            "simpleType" : "List<Value>",
+            "variableSetterType" : "java.util.Collection<Value>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -4867,7 +13186,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "SqlStatementResult",
+      "shapeName" : "StructValue",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -4876,17 +13195,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "SqlStatementResult",
-        "variableName" : "sqlStatementResult",
-        "variableType" : "SqlStatementResult",
+        "variableDeclarationType" : "StructValue",
+        "variableName" : "structValue",
+        "variableType" : "StructValue",
         "documentation" : null,
-        "simpleType" : "SqlStatementResult",
-        "variableSetterType" : "SqlStatementResult"
+        "simpleType" : "StructValue",
+        "variableSetterType" : "StructValue"
       },
       "wrapper" : false
     },
-    "StructValue" : {
-      "c2jName" : "StructValue",
+    "UpdateResult" : {
+      "c2jName" : "UpdateResult",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -4894,7 +13213,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "User Defined Type",
+      "documentation" : "<p>The response elements represent the results of an update.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -4904,17 +13223,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "attributes",
-        "c2jShape" : "ArrayValues",
+        "c2jName" : "generatedFields",
+        "c2jShape" : "FieldList",
         "deprecated" : false,
-        "documentation" : "Struct or UDT",
+        "documentation" : "<p>Values for fields generated during the request.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Struct or UDT\n@param attributes Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withAttributes",
-        "getterDocumentation" : "/**Struct or UDT\n@return Struct or UDT*/",
-        "getterMethodName" : "getAttributes",
+        "fluentSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withGeneratedFields",
+        "getterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@return Values for fields generated during the request.*/",
+        "getterMethodName" : "getGeneratedFields",
         "getterModel" : {
-          "returnType" : "java.util.List<Value>",
+          "returnType" : "java.util.List<Field>",
           "documentation" : null
         },
         "http" : {
@@ -4927,11 +13246,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "attributes",
+          "marshallLocationName" : "generatedFields",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "attributes",
+          "unmarshallLocationName" : "generatedFields",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -4943,7 +13262,7 @@
           "interfaceType" : "java.util.List",
           "listMemberModel" : {
             "c2jName" : "member",
-            "c2jShape" : "Value",
+            "c2jShape" : "Field",
             "deprecated" : false,
             "documentation" : "",
             "enumType" : null,
@@ -4952,7 +13271,7 @@
             "getterDocumentation" : "/**\n@return */",
             "getterMethodName" : "getMember",
             "getterModel" : {
-              "returnType" : "Value",
+              "returnType" : "Field",
               "documentation" : null
             },
             "http" : {
@@ -4987,12 +13306,12 @@
             "setterMethodName" : "setMember",
             "setterModel" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "Value",
+              "variableDeclarationType" : "Field",
               "variableName" : "member",
-              "variableType" : "Value",
+              "variableType" : "Field",
               "documentation" : "",
-              "simpleType" : "Value",
-              "variableSetterType" : "Value"
+              "simpleType" : "Field",
+              "variableSetterType" : "Field"
             },
             "shouldEmitLegacyEnumSetter" : false,
             "simple" : false,
@@ -5000,72 +13319,72 @@
             "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "Value",
+              "variableDeclarationType" : "Field",
               "variableName" : "member",
-              "variableType" : "Value",
+              "variableType" : "Field",
               "documentation" : "",
-              "simpleType" : "Value",
-              "variableSetterType" : "Value"
+              "simpleType" : "Field",
+              "variableSetterType" : "Field"
             },
             "xmlNameSpaceUri" : null
           },
           "memberLocationName" : null,
-          "memberType" : "Value",
+          "memberType" : "Field",
           "map" : false,
           "marshallNonAutoConstructedEmptyLists" : false,
           "memberAdditionalMarshallingPath" : null,
           "memberAdditionalUnmarshallingPath" : null,
           "sendEmptyQueryString" : false,
           "simple" : false,
-          "simpleType" : "Value",
-          "templateImplType" : "java.util.ArrayList<Value>",
-          "templateType" : "java.util.List<Value>"
+          "simpleType" : "Field",
+          "templateImplType" : "java.util.ArrayList<Field>",
+          "templateType" : "java.util.List<Field>"
         },
         "map" : false,
         "mapModel" : null,
         "marshallingTargetClass" : "List",
         "marshallingType" : "LIST",
-        "name" : "Attributes",
+        "name" : "GeneratedFields",
         "sensitive" : false,
-        "setterDocumentation" : "/**Struct or UDT\n@param attributes Struct or UDT*/",
-        "setterMethodName" : "setAttributes",
+        "setterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.*/",
+        "setterMethodName" : "setGeneratedFields",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Value>",
-          "variableName" : "attributes",
-          "variableType" : "java.util.List<Value>",
+          "variableDeclarationType" : "java.util.List<Field>",
+          "variableName" : "generatedFields",
+          "variableType" : "java.util.List<Field>",
           "documentation" : "",
-          "simpleType" : "List<Value>",
-          "variableSetterType" : "java.util.Collection<Value>"
+          "simpleType" : "List<Field>",
+          "variableSetterType" : "java.util.Collection<Field>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Struct or UDT\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to override the existing values.</p>\n@param attributes Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setGeneratedFields(java.util.Collection)} or {@link #withGeneratedFields(java.util.Collection)} if you want to override the existing values.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<Value>",
-          "variableName" : "attributes",
-          "variableType" : "java.util.List<Value>",
-          "documentation" : "Struct or UDT",
-          "simpleType" : "List<Value>",
-          "variableSetterType" : "java.util.Collection<Value>"
+          "variableDeclarationType" : "java.util.List<Field>",
+          "variableName" : "generatedFields",
+          "variableType" : "java.util.List<Field>",
+          "documentation" : "<p>Values for fields generated during the request.</p>",
+          "simpleType" : "List<Field>",
+          "variableSetterType" : "java.util.Collection<Field>"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "Attributes" : {
-          "c2jName" : "attributes",
-          "c2jShape" : "ArrayValues",
+        "GeneratedFields" : {
+          "c2jName" : "generatedFields",
+          "c2jShape" : "FieldList",
           "deprecated" : false,
-          "documentation" : "Struct or UDT",
+          "documentation" : "<p>Values for fields generated during the request.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Struct or UDT\n@param attributes Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withAttributes",
-          "getterDocumentation" : "/**Struct or UDT\n@return Struct or UDT*/",
-          "getterMethodName" : "getAttributes",
+          "fluentSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withGeneratedFields",
+          "getterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@return Values for fields generated during the request.*/",
+          "getterMethodName" : "getGeneratedFields",
           "getterModel" : {
-            "returnType" : "java.util.List<Value>",
+            "returnType" : "java.util.List<Field>",
             "documentation" : null
           },
           "http" : {
@@ -5078,11 +13397,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "attributes",
+            "marshallLocationName" : "generatedFields",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "attributes",
+            "unmarshallLocationName" : "generatedFields",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -5094,7 +13413,7 @@
             "interfaceType" : "java.util.List",
             "listMemberModel" : {
               "c2jName" : "member",
-              "c2jShape" : "Value",
+              "c2jShape" : "Field",
               "deprecated" : false,
               "documentation" : "",
               "enumType" : null,
@@ -5103,7 +13422,7 @@
               "getterDocumentation" : "/**\n@return */",
               "getterMethodName" : "getMember",
               "getterModel" : {
-                "returnType" : "Value",
+                "returnType" : "Field",
                 "documentation" : null
               },
               "http" : {
@@ -5138,12 +13457,12 @@
               "setterMethodName" : "setMember",
               "setterModel" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "Value",
+                "variableDeclarationType" : "Field",
                 "variableName" : "member",
-                "variableType" : "Value",
+                "variableType" : "Field",
                 "documentation" : "",
-                "simpleType" : "Value",
-                "variableSetterType" : "Value"
+                "simpleType" : "Field",
+                "variableSetterType" : "Field"
               },
               "shouldEmitLegacyEnumSetter" : false,
               "simple" : false,
@@ -5151,56 +13470,56 @@
               "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
               "variable" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "Value",
+                "variableDeclarationType" : "Field",
                 "variableName" : "member",
-                "variableType" : "Value",
+                "variableType" : "Field",
                 "documentation" : "",
-                "simpleType" : "Value",
-                "variableSetterType" : "Value"
+                "simpleType" : "Field",
+                "variableSetterType" : "Field"
               },
               "xmlNameSpaceUri" : null
             },
             "memberLocationName" : null,
-            "memberType" : "Value",
+            "memberType" : "Field",
             "map" : false,
             "marshallNonAutoConstructedEmptyLists" : false,
             "memberAdditionalMarshallingPath" : null,
             "memberAdditionalUnmarshallingPath" : null,
             "sendEmptyQueryString" : false,
             "simple" : false,
-            "simpleType" : "Value",
-            "templateImplType" : "java.util.ArrayList<Value>",
-            "templateType" : "java.util.List<Value>"
+            "simpleType" : "Field",
+            "templateImplType" : "java.util.ArrayList<Field>",
+            "templateType" : "java.util.List<Field>"
           },
           "map" : false,
           "mapModel" : null,
           "marshallingTargetClass" : "List",
           "marshallingType" : "LIST",
-          "name" : "Attributes",
+          "name" : "GeneratedFields",
           "sensitive" : false,
-          "setterDocumentation" : "/**Struct or UDT\n@param attributes Struct or UDT*/",
-          "setterMethodName" : "setAttributes",
+          "setterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n@param generatedFields Values for fields generated during the request.*/",
+          "setterMethodName" : "setGeneratedFields",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Value>",
-            "variableName" : "attributes",
-            "variableType" : "java.util.List<Value>",
+            "variableDeclarationType" : "java.util.List<Field>",
+            "variableName" : "generatedFields",
+            "variableType" : "java.util.List<Field>",
             "documentation" : "",
-            "simpleType" : "List<Value>",
-            "variableSetterType" : "java.util.Collection<Value>"
+            "simpleType" : "List<Field>",
+            "variableSetterType" : "java.util.Collection<Field>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Struct or UDT\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to override the existing values.</p>\n@param attributes Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>Values for fields generated during the request.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setGeneratedFields(java.util.Collection)} or {@link #withGeneratedFields(java.util.Collection)} if you want to override the existing values.</p>\n@param generatedFields Values for fields generated during the request.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<Value>",
-            "variableName" : "attributes",
-            "variableType" : "java.util.List<Value>",
-            "documentation" : "Struct or UDT",
-            "simpleType" : "List<Value>",
-            "variableSetterType" : "java.util.Collection<Value>"
+            "variableDeclarationType" : "java.util.List<Field>",
+            "variableName" : "generatedFields",
+            "variableType" : "java.util.List<Field>",
+            "documentation" : "<p>Values for fields generated during the request.</p>",
+            "simpleType" : "List<Field>",
+            "variableSetterType" : "java.util.Collection<Field>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -5208,7 +13527,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "StructValue",
+      "shapeName" : "UpdateResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -5217,12 +13536,12 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "StructValue",
-        "variableName" : "structValue",
-        "variableType" : "StructValue",
+        "variableDeclarationType" : "UpdateResult",
+        "variableName" : "updateResult",
+        "variableType" : "UpdateResult",
         "documentation" : null,
-        "simpleType" : "StructValue",
-        "variableSetterType" : "StructValue"
+        "simpleType" : "UpdateResult",
+        "variableSetterType" : "UpdateResult"
       },
       "wrapper" : false
     },
@@ -5235,7 +13554,7 @@
         "skipGeneratingUnmarshaller" : false
       },
       "deprecated" : false,
-      "documentation" : "Column value",
+      "documentation" : "<p>Contains the value of a column.</p>",
       "enums" : null,
       "errorCode" : null,
       "hasHeaderMember" : false,
@@ -5246,13 +13565,13 @@
       "marshaller" : null,
       "members" : [ {
         "c2jName" : "arrayValues",
-        "c2jShape" : "ArrayValues",
+        "c2jShape" : "ArrayValueList",
         "deprecated" : false,
-        "documentation" : "Arbitrarily nested arrays",
+        "documentation" : "<p>An array of column values.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Arbitrarily nested arrays\n@param arrayValues Arbitrarily nested arrays\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>An array of column values.</p>\n@param arrayValues An array of column values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withArrayValues",
-        "getterDocumentation" : "/**Arbitrarily nested arrays\n@return Arbitrarily nested arrays*/",
+        "getterDocumentation" : "/**<p>An array of column values.</p>\n@return An array of column values.*/",
         "getterMethodName" : "getArrayValues",
         "getterModel" : {
           "returnType" : "java.util.List<Value>",
@@ -5368,7 +13687,7 @@
         "marshallingType" : "LIST",
         "name" : "ArrayValues",
         "sensitive" : false,
-        "setterDocumentation" : "/**Arbitrarily nested arrays\n@param arrayValues Arbitrarily nested arrays*/",
+        "setterDocumentation" : "/**<p>An array of column values.</p>\n@param arrayValues An array of column values.*/",
         "setterMethodName" : "setArrayValues",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5382,26 +13701,26 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Arbitrarily nested arrays\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setArrayValues(java.util.Collection)} or {@link #withArrayValues(java.util.Collection)} if you want to override the existing values.</p>\n@param arrayValues Arbitrarily nested arrays\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>An array of column values.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setArrayValues(java.util.Collection)} or {@link #withArrayValues(java.util.Collection)} if you want to override the existing values.</p>\n@param arrayValues An array of column values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "java.util.List<Value>",
           "variableName" : "arrayValues",
           "variableType" : "java.util.List<Value>",
-          "documentation" : "Arbitrarily nested arrays",
+          "documentation" : "<p>An array of column values.</p>",
           "simpleType" : "List<Value>",
           "variableSetterType" : "java.util.Collection<Value>"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "bigIntValue",
-        "c2jShape" : "Long",
+        "c2jShape" : "BoxedLong",
         "deprecated" : false,
-        "documentation" : "Long value",
+        "documentation" : "<p>A value for a column of big integer data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Long value\n@param bigIntValue Long value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@param bigIntValue A value for a column of big integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withBigIntValue",
-        "getterDocumentation" : "/**Long value\n@return Long value*/",
+        "getterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@return A value for a column of big integer data type.*/",
         "getterMethodName" : "getBigIntValue",
         "getterModel" : {
           "returnType" : "Long",
@@ -5435,7 +13754,7 @@
         "marshallingType" : "LONG",
         "name" : "BigIntValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Long value\n@param bigIntValue Long value*/",
+        "setterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@param bigIntValue A value for a column of big integer data type.*/",
         "setterMethodName" : "setBigIntValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5449,26 +13768,26 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Long value\n@param bigIntValue Long value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@param bigIntValue A value for a column of big integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Long",
           "variableName" : "bigIntValue",
           "variableType" : "Long",
-          "documentation" : "Long value",
+          "documentation" : "<p>A value for a column of big integer data type.</p>",
           "simpleType" : "Long",
           "variableSetterType" : "Long"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "bitValue",
-        "c2jShape" : "Boolean",
+        "c2jShape" : "BoxedBoolean",
         "deprecated" : false,
-        "documentation" : "Bit value",
+        "documentation" : "<p>A value for a column of BIT data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Bit value\n@param bitValue Bit value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@param bitValue A value for a column of BIT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withBitValue",
-        "getterDocumentation" : "/**Bit value\n@return Bit value*/",
+        "getterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@return A value for a column of BIT data type.*/",
         "getterMethodName" : "getBitValue",
         "getterModel" : {
           "returnType" : "Boolean",
@@ -5502,7 +13821,7 @@
         "marshallingType" : "BOOLEAN",
         "name" : "BitValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Bit value\n@param bitValue Bit value*/",
+        "setterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@param bitValue A value for a column of BIT data type.*/",
         "setterMethodName" : "setBitValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5516,13 +13835,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Bit value\n@param bitValue Bit value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@param bitValue A value for a column of BIT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Boolean",
           "variableName" : "bitValue",
           "variableType" : "Boolean",
-          "documentation" : "Bit value",
+          "documentation" : "<p>A value for a column of BIT data type.</p>",
           "simpleType" : "Boolean",
           "variableSetterType" : "Boolean"
         },
@@ -5531,11 +13850,11 @@
         "c2jName" : "blobValue",
         "c2jShape" : "Blob",
         "deprecated" : false,
-        "documentation" : "Blob value",
+        "documentation" : "<p>A value for a column of BLOB data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Blob value<p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue Blob value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value for a column of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withBlobValue",
-        "getterDocumentation" : "/**Blob value\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return Blob value*/",
+        "getterDocumentation" : "/**<p>A value for a column of BLOB data type.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return A value for a column of BLOB data type.*/",
         "getterMethodName" : "getBlobValue",
         "getterModel" : {
           "returnType" : "java.nio.ByteBuffer",
@@ -5569,7 +13888,7 @@
         "marshallingType" : "BYTE_BUFFER",
         "name" : "BlobValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Blob value<p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue Blob value*/",
+        "setterDocumentation" : "/**<p>A value for a column of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value for a column of BLOB data type.*/",
         "setterMethodName" : "setBlobValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5583,26 +13902,26 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Blob value\n@param blobValue Blob value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of BLOB data type.</p>\n@param blobValue A value for a column of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "java.nio.ByteBuffer",
           "variableName" : "blobValue",
           "variableType" : "java.nio.ByteBuffer",
-          "documentation" : "Blob value",
+          "documentation" : "<p>A value for a column of BLOB data type.</p>",
           "simpleType" : "ByteBuffer",
           "variableSetterType" : "java.nio.ByteBuffer"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "doubleValue",
-        "c2jShape" : "Double",
+        "c2jShape" : "BoxedDouble",
         "deprecated" : false,
-        "documentation" : "Double value",
+        "documentation" : "<p>A value for a column of double data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Double value\n@param doubleValue Double value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@param doubleValue A value for a column of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withDoubleValue",
-        "getterDocumentation" : "/**Double value\n@return Double value*/",
+        "getterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@return A value for a column of double data type.*/",
         "getterMethodName" : "getDoubleValue",
         "getterModel" : {
           "returnType" : "Double",
@@ -5636,7 +13955,7 @@
         "marshallingType" : "DOUBLE",
         "name" : "DoubleValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Double value\n@param doubleValue Double value*/",
+        "setterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@param doubleValue A value for a column of double data type.*/",
         "setterMethodName" : "setDoubleValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5650,26 +13969,26 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Double value\n@param doubleValue Double value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@param doubleValue A value for a column of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Double",
           "variableName" : "doubleValue",
           "variableType" : "Double",
-          "documentation" : "Double value",
+          "documentation" : "<p>A value for a column of double data type.</p>",
           "simpleType" : "Double",
           "variableSetterType" : "Double"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "intValue",
-        "c2jShape" : "Integer",
+        "c2jShape" : "BoxedInteger",
         "deprecated" : false,
-        "documentation" : "Integer value",
+        "documentation" : "<p>A value for a column of integer data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Integer value\n@param intValue Integer value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@param intValue A value for a column of integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withIntValue",
-        "getterDocumentation" : "/**Integer value\n@return Integer value*/",
+        "getterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@return A value for a column of integer data type.*/",
         "getterMethodName" : "getIntValue",
         "getterModel" : {
           "returnType" : "Integer",
@@ -5703,7 +14022,7 @@
         "marshallingType" : "INTEGER",
         "name" : "IntValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Integer value\n@param intValue Integer value*/",
+        "setterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@param intValue A value for a column of integer data type.*/",
         "setterMethodName" : "setIntValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5717,26 +14036,26 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Integer value\n@param intValue Integer value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@param intValue A value for a column of integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Integer",
           "variableName" : "intValue",
           "variableType" : "Integer",
-          "documentation" : "Integer value",
+          "documentation" : "<p>A value for a column of integer data type.</p>",
           "simpleType" : "Integer",
           "variableSetterType" : "Integer"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "isNull",
-        "c2jShape" : "Boolean",
+        "c2jShape" : "BoxedBoolean",
         "deprecated" : false,
-        "documentation" : "Is column null",
+        "documentation" : "<p>A NULL value.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Is column null\n@param isNull Is column null\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withIsNull",
-        "getterDocumentation" : "/**Is column null\n@return Is column null*/",
+        "getterDocumentation" : "/**<p>A NULL value.</p>\n@return A NULL value.*/",
         "getterMethodName" : "getIsNull",
         "getterModel" : {
           "returnType" : "Boolean",
@@ -5770,7 +14089,7 @@
         "marshallingType" : "BOOLEAN",
         "name" : "IsNull",
         "sensitive" : false,
-        "setterDocumentation" : "/**Is column null\n@param isNull Is column null*/",
+        "setterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.*/",
         "setterMethodName" : "setIsNull",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5784,26 +14103,26 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Is column null\n@param isNull Is column null\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Boolean",
           "variableName" : "isNull",
           "variableType" : "Boolean",
-          "documentation" : "Is column null",
+          "documentation" : "<p>A NULL value.</p>",
           "simpleType" : "Boolean",
           "variableSetterType" : "Boolean"
         },
         "xmlNameSpaceUri" : null
       }, {
         "c2jName" : "realValue",
-        "c2jShape" : "Float",
+        "c2jShape" : "BoxedFloat",
         "deprecated" : false,
-        "documentation" : "Float value",
+        "documentation" : "<p>A value for a column of real data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Float value\n@param realValue Float value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@param realValue A value for a column of real data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withRealValue",
-        "getterDocumentation" : "/**Float value\n@return Float value*/",
+        "getterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@return A value for a column of real data type.*/",
         "getterMethodName" : "getRealValue",
         "getterModel" : {
           "returnType" : "Float",
@@ -5837,7 +14156,7 @@
         "marshallingType" : "FLOAT",
         "name" : "RealValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Float value\n@param realValue Float value*/",
+        "setterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@param realValue A value for a column of real data type.*/",
         "setterMethodName" : "setRealValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5851,13 +14170,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Float value\n@param realValue Float value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@param realValue A value for a column of real data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "Float",
           "variableName" : "realValue",
           "variableType" : "Float",
-          "documentation" : "Float value",
+          "documentation" : "<p>A value for a column of real data type.</p>",
           "simpleType" : "Float",
           "variableSetterType" : "Float"
         },
@@ -5866,11 +14185,11 @@
         "c2jName" : "stringValue",
         "c2jShape" : "String",
         "deprecated" : false,
-        "documentation" : "String value",
+        "documentation" : "<p>A value for a column of string data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**String value\n@param stringValue String value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@param stringValue A value for a column of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withStringValue",
-        "getterDocumentation" : "/**String value\n@return String value*/",
+        "getterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@return A value for a column of string data type.*/",
         "getterMethodName" : "getStringValue",
         "getterModel" : {
           "returnType" : "String",
@@ -5904,7 +14223,7 @@
         "marshallingType" : "STRING",
         "name" : "StringValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**String value\n@param stringValue String value*/",
+        "setterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@param stringValue A value for a column of string data type.*/",
         "setterMethodName" : "setStringValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5918,13 +14237,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**String value\n@param stringValue String value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@param stringValue A value for a column of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
           "variableName" : "stringValue",
           "variableType" : "String",
-          "documentation" : "String value",
+          "documentation" : "<p>A value for a column of string data type.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -5933,11 +14252,11 @@
         "c2jName" : "structValue",
         "c2jShape" : "StructValue",
         "deprecated" : false,
-        "documentation" : "Struct or UDT",
+        "documentation" : "<p>A value for a column of STRUCT data type.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**Struct or UDT\n@param structValue Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@param structValue A value for a column of STRUCT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withStructValue",
-        "getterDocumentation" : "/**Struct or UDT\n@return Struct or UDT*/",
+        "getterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@return A value for a column of STRUCT data type.*/",
         "getterMethodName" : "getStructValue",
         "getterModel" : {
           "returnType" : "StructValue",
@@ -5971,7 +14290,7 @@
         "marshallingType" : "STRUCTURED",
         "name" : "StructValue",
         "sensitive" : false,
-        "setterDocumentation" : "/**Struct or UDT\n@param structValue Struct or UDT*/",
+        "setterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@param structValue A value for a column of STRUCT data type.*/",
         "setterMethodName" : "setStructValue",
         "setterModel" : {
           "timestampFormat" : null,
@@ -5985,13 +14304,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**Struct or UDT\n@param structValue Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@param structValue A value for a column of STRUCT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "StructValue",
           "variableName" : "structValue",
           "variableType" : "StructValue",
-          "documentation" : "Struct or UDT",
+          "documentation" : "<p>A value for a column of STRUCT data type.</p>",
           "simpleType" : "StructValue",
           "variableSetterType" : "StructValue"
         },
@@ -6000,13 +14319,13 @@
       "membersAsMap" : {
         "ArrayValues" : {
           "c2jName" : "arrayValues",
-          "c2jShape" : "ArrayValues",
+          "c2jShape" : "ArrayValueList",
           "deprecated" : false,
-          "documentation" : "Arbitrarily nested arrays",
+          "documentation" : "<p>An array of column values.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Arbitrarily nested arrays\n@param arrayValues Arbitrarily nested arrays\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>An array of column values.</p>\n@param arrayValues An array of column values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withArrayValues",
-          "getterDocumentation" : "/**Arbitrarily nested arrays\n@return Arbitrarily nested arrays*/",
+          "getterDocumentation" : "/**<p>An array of column values.</p>\n@return An array of column values.*/",
           "getterMethodName" : "getArrayValues",
           "getterModel" : {
             "returnType" : "java.util.List<Value>",
@@ -6122,7 +14441,7 @@
           "marshallingType" : "LIST",
           "name" : "ArrayValues",
           "sensitive" : false,
-          "setterDocumentation" : "/**Arbitrarily nested arrays\n@param arrayValues Arbitrarily nested arrays*/",
+          "setterDocumentation" : "/**<p>An array of column values.</p>\n@param arrayValues An array of column values.*/",
           "setterMethodName" : "setArrayValues",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6136,13 +14455,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Arbitrarily nested arrays\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setArrayValues(java.util.Collection)} or {@link #withArrayValues(java.util.Collection)} if you want to override the existing values.</p>\n@param arrayValues Arbitrarily nested arrays\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>An array of column values.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setArrayValues(java.util.Collection)} or {@link #withArrayValues(java.util.Collection)} if you want to override the existing values.</p>\n@param arrayValues An array of column values.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "java.util.List<Value>",
             "variableName" : "arrayValues",
             "variableType" : "java.util.List<Value>",
-            "documentation" : "Arbitrarily nested arrays",
+            "documentation" : "<p>An array of column values.</p>",
             "simpleType" : "List<Value>",
             "variableSetterType" : "java.util.Collection<Value>"
           },
@@ -6150,13 +14469,13 @@
         },
         "BigIntValue" : {
           "c2jName" : "bigIntValue",
-          "c2jShape" : "Long",
+          "c2jShape" : "BoxedLong",
           "deprecated" : false,
-          "documentation" : "Long value",
+          "documentation" : "<p>A value for a column of big integer data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Long value\n@param bigIntValue Long value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@param bigIntValue A value for a column of big integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withBigIntValue",
-          "getterDocumentation" : "/**Long value\n@return Long value*/",
+          "getterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@return A value for a column of big integer data type.*/",
           "getterMethodName" : "getBigIntValue",
           "getterModel" : {
             "returnType" : "Long",
@@ -6190,7 +14509,7 @@
           "marshallingType" : "LONG",
           "name" : "BigIntValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Long value\n@param bigIntValue Long value*/",
+          "setterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@param bigIntValue A value for a column of big integer data type.*/",
           "setterMethodName" : "setBigIntValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6204,13 +14523,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Long value\n@param bigIntValue Long value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of big integer data type.</p>\n@param bigIntValue A value for a column of big integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Long",
             "variableName" : "bigIntValue",
             "variableType" : "Long",
-            "documentation" : "Long value",
+            "documentation" : "<p>A value for a column of big integer data type.</p>",
             "simpleType" : "Long",
             "variableSetterType" : "Long"
           },
@@ -6218,13 +14537,13 @@
         },
         "BitValue" : {
           "c2jName" : "bitValue",
-          "c2jShape" : "Boolean",
+          "c2jShape" : "BoxedBoolean",
           "deprecated" : false,
-          "documentation" : "Bit value",
+          "documentation" : "<p>A value for a column of BIT data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Bit value\n@param bitValue Bit value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@param bitValue A value for a column of BIT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withBitValue",
-          "getterDocumentation" : "/**Bit value\n@return Bit value*/",
+          "getterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@return A value for a column of BIT data type.*/",
           "getterMethodName" : "getBitValue",
           "getterModel" : {
             "returnType" : "Boolean",
@@ -6258,7 +14577,7 @@
           "marshallingType" : "BOOLEAN",
           "name" : "BitValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Bit value\n@param bitValue Bit value*/",
+          "setterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@param bitValue A value for a column of BIT data type.*/",
           "setterMethodName" : "setBitValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6272,13 +14591,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Bit value\n@param bitValue Bit value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of BIT data type.</p>\n@param bitValue A value for a column of BIT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Boolean",
             "variableName" : "bitValue",
             "variableType" : "Boolean",
-            "documentation" : "Bit value",
+            "documentation" : "<p>A value for a column of BIT data type.</p>",
             "simpleType" : "Boolean",
             "variableSetterType" : "Boolean"
           },
@@ -6288,11 +14607,11 @@
           "c2jName" : "blobValue",
           "c2jShape" : "Blob",
           "deprecated" : false,
-          "documentation" : "Blob value",
+          "documentation" : "<p>A value for a column of BLOB data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Blob value<p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue Blob value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value for a column of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withBlobValue",
-          "getterDocumentation" : "/**Blob value\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return Blob value*/",
+          "getterDocumentation" : "/**<p>A value for a column of BLOB data type.</p>\n<p>\n{@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}. Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the {@code position}.\n</p>\n@return A value for a column of BLOB data type.*/",
           "getterMethodName" : "getBlobValue",
           "getterModel" : {
             "returnType" : "java.nio.ByteBuffer",
@@ -6326,7 +14645,7 @@
           "marshallingType" : "BYTE_BUFFER",
           "name" : "BlobValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Blob value<p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue Blob value*/",
+          "setterDocumentation" : "/**<p>A value for a column of BLOB data type.</p><p>\nThe AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service. Users of the SDK should not perform Base64 encoding on this field.\n</p>\n<p>\nWarning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future major version of the SDK.\n</p>\n\n@param blobValue A value for a column of BLOB data type.*/",
           "setterMethodName" : "setBlobValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6340,13 +14659,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Blob value\n@param blobValue Blob value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of BLOB data type.</p>\n@param blobValue A value for a column of BLOB data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "java.nio.ByteBuffer",
             "variableName" : "blobValue",
             "variableType" : "java.nio.ByteBuffer",
-            "documentation" : "Blob value",
+            "documentation" : "<p>A value for a column of BLOB data type.</p>",
             "simpleType" : "ByteBuffer",
             "variableSetterType" : "java.nio.ByteBuffer"
           },
@@ -6354,13 +14673,13 @@
         },
         "DoubleValue" : {
           "c2jName" : "doubleValue",
-          "c2jShape" : "Double",
+          "c2jShape" : "BoxedDouble",
           "deprecated" : false,
-          "documentation" : "Double value",
+          "documentation" : "<p>A value for a column of double data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Double value\n@param doubleValue Double value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@param doubleValue A value for a column of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withDoubleValue",
-          "getterDocumentation" : "/**Double value\n@return Double value*/",
+          "getterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@return A value for a column of double data type.*/",
           "getterMethodName" : "getDoubleValue",
           "getterModel" : {
             "returnType" : "Double",
@@ -6394,7 +14713,7 @@
           "marshallingType" : "DOUBLE",
           "name" : "DoubleValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Double value\n@param doubleValue Double value*/",
+          "setterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@param doubleValue A value for a column of double data type.*/",
           "setterMethodName" : "setDoubleValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6408,13 +14727,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Double value\n@param doubleValue Double value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of double data type.</p>\n@param doubleValue A value for a column of double data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Double",
             "variableName" : "doubleValue",
             "variableType" : "Double",
-            "documentation" : "Double value",
+            "documentation" : "<p>A value for a column of double data type.</p>",
             "simpleType" : "Double",
             "variableSetterType" : "Double"
           },
@@ -6422,13 +14741,13 @@
         },
         "IntValue" : {
           "c2jName" : "intValue",
-          "c2jShape" : "Integer",
+          "c2jShape" : "BoxedInteger",
           "deprecated" : false,
-          "documentation" : "Integer value",
+          "documentation" : "<p>A value for a column of integer data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Integer value\n@param intValue Integer value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@param intValue A value for a column of integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withIntValue",
-          "getterDocumentation" : "/**Integer value\n@return Integer value*/",
+          "getterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@return A value for a column of integer data type.*/",
           "getterMethodName" : "getIntValue",
           "getterModel" : {
             "returnType" : "Integer",
@@ -6462,7 +14781,7 @@
           "marshallingType" : "INTEGER",
           "name" : "IntValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Integer value\n@param intValue Integer value*/",
+          "setterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@param intValue A value for a column of integer data type.*/",
           "setterMethodName" : "setIntValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6476,13 +14795,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Integer value\n@param intValue Integer value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of integer data type.</p>\n@param intValue A value for a column of integer data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Integer",
             "variableName" : "intValue",
             "variableType" : "Integer",
-            "documentation" : "Integer value",
+            "documentation" : "<p>A value for a column of integer data type.</p>",
             "simpleType" : "Integer",
             "variableSetterType" : "Integer"
           },
@@ -6490,13 +14809,13 @@
         },
         "IsNull" : {
           "c2jName" : "isNull",
-          "c2jShape" : "Boolean",
+          "c2jShape" : "BoxedBoolean",
           "deprecated" : false,
-          "documentation" : "Is column null",
+          "documentation" : "<p>A NULL value.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Is column null\n@param isNull Is column null\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withIsNull",
-          "getterDocumentation" : "/**Is column null\n@return Is column null*/",
+          "getterDocumentation" : "/**<p>A NULL value.</p>\n@return A NULL value.*/",
           "getterMethodName" : "getIsNull",
           "getterModel" : {
             "returnType" : "Boolean",
@@ -6530,7 +14849,7 @@
           "marshallingType" : "BOOLEAN",
           "name" : "IsNull",
           "sensitive" : false,
-          "setterDocumentation" : "/**Is column null\n@param isNull Is column null*/",
+          "setterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.*/",
           "setterMethodName" : "setIsNull",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6544,13 +14863,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Is column null\n@param isNull Is column null\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A NULL value.</p>\n@param isNull A NULL value.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Boolean",
             "variableName" : "isNull",
             "variableType" : "Boolean",
-            "documentation" : "Is column null",
+            "documentation" : "<p>A NULL value.</p>",
             "simpleType" : "Boolean",
             "variableSetterType" : "Boolean"
           },
@@ -6558,13 +14877,13 @@
         },
         "RealValue" : {
           "c2jName" : "realValue",
-          "c2jShape" : "Float",
+          "c2jShape" : "BoxedFloat",
           "deprecated" : false,
-          "documentation" : "Float value",
+          "documentation" : "<p>A value for a column of real data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Float value\n@param realValue Float value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@param realValue A value for a column of real data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withRealValue",
-          "getterDocumentation" : "/**Float value\n@return Float value*/",
+          "getterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@return A value for a column of real data type.*/",
           "getterMethodName" : "getRealValue",
           "getterModel" : {
             "returnType" : "Float",
@@ -6598,7 +14917,7 @@
           "marshallingType" : "FLOAT",
           "name" : "RealValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Float value\n@param realValue Float value*/",
+          "setterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@param realValue A value for a column of real data type.*/",
           "setterMethodName" : "setRealValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6612,13 +14931,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Float value\n@param realValue Float value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of real data type.</p>\n@param realValue A value for a column of real data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "Float",
             "variableName" : "realValue",
             "variableType" : "Float",
-            "documentation" : "Float value",
+            "documentation" : "<p>A value for a column of real data type.</p>",
             "simpleType" : "Float",
             "variableSetterType" : "Float"
           },
@@ -6628,11 +14947,11 @@
           "c2jName" : "stringValue",
           "c2jShape" : "String",
           "deprecated" : false,
-          "documentation" : "String value",
+          "documentation" : "<p>A value for a column of string data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**String value\n@param stringValue String value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@param stringValue A value for a column of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withStringValue",
-          "getterDocumentation" : "/**String value\n@return String value*/",
+          "getterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@return A value for a column of string data type.*/",
           "getterMethodName" : "getStringValue",
           "getterModel" : {
             "returnType" : "String",
@@ -6666,7 +14985,7 @@
           "marshallingType" : "STRING",
           "name" : "StringValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**String value\n@param stringValue String value*/",
+          "setterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@param stringValue A value for a column of string data type.*/",
           "setterMethodName" : "setStringValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6680,13 +14999,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**String value\n@param stringValue String value\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of string data type.</p>\n@param stringValue A value for a column of string data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
             "variableName" : "stringValue",
             "variableType" : "String",
-            "documentation" : "String value",
+            "documentation" : "<p>A value for a column of string data type.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -6696,11 +15015,11 @@
           "c2jName" : "structValue",
           "c2jShape" : "StructValue",
           "deprecated" : false,
-          "documentation" : "Struct or UDT",
+          "documentation" : "<p>A value for a column of STRUCT data type.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**Struct or UDT\n@param structValue Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@param structValue A value for a column of STRUCT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withStructValue",
-          "getterDocumentation" : "/**Struct or UDT\n@return Struct or UDT*/",
+          "getterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@return A value for a column of STRUCT data type.*/",
           "getterMethodName" : "getStructValue",
           "getterModel" : {
             "returnType" : "StructValue",
@@ -6734,7 +15053,7 @@
           "marshallingType" : "STRUCTURED",
           "name" : "StructValue",
           "sensitive" : false,
-          "setterDocumentation" : "/**Struct or UDT\n@param structValue Struct or UDT*/",
+          "setterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@param structValue A value for a column of STRUCT data type.*/",
           "setterMethodName" : "setStructValue",
           "setterModel" : {
             "timestampFormat" : null,
@@ -6748,13 +15067,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**Struct or UDT\n@param structValue Struct or UDT\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>A value for a column of STRUCT data type.</p>\n@param structValue A value for a column of STRUCT data type.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "StructValue",
             "variableName" : "structValue",
             "variableType" : "StructValue",
-            "documentation" : "Struct or UDT",
+            "documentation" : "<p>A value for a column of STRUCT data type.</p>",
             "simpleType" : "StructValue",
             "variableSetterType" : "StructValue"
           },
diff --git a/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-model.json b/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-model.json
index d4971a305506..345dbd95efc9 100644
--- a/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/rds-data-2018-08-01-model.json
@@ -1,270 +1,440 @@
 {
-        "version": "2.0",
-      "metadata": {
-          "apiVersion": "2018-08-01",
-          "endpointPrefix": "rds-data",
-        "jsonVersion": "1.1",
-        "protocol": "rest-json",
-          "serviceFullName": "AWS RDS DataService",
-          "serviceId": "RDS Data",
-          "signatureVersion": "v4",
-          "signingName": "rds-data",
-          "uid": "rds-data-2018-08-01"
-        },
-        "documentation": "AWS RDS DataService provides Http Endpoint to query RDS databases.",
-        "operations": {
-        "ExecuteSql": {
-            "name": "ExecuteSql",
-            "http": {
-            "method": "POST",
-            "requestUri": "/ExecuteSql",
-            "responseCode": 200
-          },
-          "input": {
-              "shape": "ExecuteSqlRequest"
-          },
-        "output": {
-          "shape": "ExecuteSqlResponse"
+  "version": "2.0",
+  "metadata": {
+    "apiVersion": "2018-08-01",
+    "endpointPrefix": "rds-data",
+    "jsonVersion": "1.1",
+    "protocol": "rest-json",
+    "serviceFullName": "AWS RDS DataService",
+    "serviceId": "RDS Data",
+    "signatureVersion": "v4",
+    "signingName": "rds-data",
+    "uid": "rds-data-2018-08-01"
+  },
+  "documentation": "<fullname>Amazon RDS Data Service</fullname>\n        <p>Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora\n            Serverless DB cluster. To run these statements, you work with the Data Service\n            API.</p>\n        <p>For more information about the Data Service API, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html\">Using the Data API for Aurora\n                Serverless</a> in the <i>Amazon Aurora User Guide</i>.</p>",
+  "operations": {
+    "BatchExecuteStatement": {
+      "name": "BatchExecuteStatement",
+      "http": {
+        "method": "POST",
+        "requestUri": "/BatchExecute",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "BatchExecuteStatementRequest"
+      },
+      "output": {
+        "shape": "BatchExecuteStatementResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ServiceUnavailableError"
+        },
+        {
+          "shape": "StatementTimeoutException"
+        }
+      ],
+      "documentation": "<p>Runs a batch SQL statement over an array of data.</p>\n        <p>You can run bulk update and insert operations for multiple records using a DML \n            statement with different parameter sets. Bulk operations can provide a significant \n            performance improvement over individual insert and update operations.</p>\n        <important>    \n            <p>If a call isn't part of a transaction because it doesn't include the\n                    <code>transactionID</code> parameter, changes that result from the call are\n                committed automatically.</p>    \n        </important>"
+    },
+    "BeginTransaction": {
+      "name": "BeginTransaction",
+      "http": {
+        "method": "POST",
+        "requestUri": "/BeginTransaction",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "BeginTransactionRequest"
+      },
+      "output": {
+        "shape": "BeginTransactionResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ServiceUnavailableError"
+        },
+        {
+          "shape": "StatementTimeoutException"
+        }
+      ],
+      "documentation": "<p>Starts a SQL transaction.</p>\n        \n        <important>\n            <p>A transaction can run for a maximum of 24 hours. A transaction is terminated and \n                rolled back automatically after 24 hours.</p>\n            <p>A transaction times out if no calls use its transaction ID in three minutes. \n                If a transaction times out before it's committed, it's rolled back\n                automatically.</p>\n            <p>DDL statements inside a transaction cause an implicit commit. We recommend \n                that you run each DDL statement in a separate <code>ExecuteStatement</code> call with \n                <code>continueAfterTimeout</code> enabled.</p>\n        </important>"
+    },
+    "CommitTransaction": {
+      "name": "CommitTransaction",
+      "http": {
+        "method": "POST",
+        "requestUri": "/CommitTransaction",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "CommitTransactionRequest"
+      },
+      "output": {
+        "shape": "CommitTransactionResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "NotFoundException"
+        },
+        {
+          "shape": "ServiceUnavailableError"
+        }
+      ],
+      "documentation": "<p>Ends a SQL transaction started with the <code>BeginTransaction</code> operation and\n            commits the changes.</p>"
+    },
+    "ExecuteSql": {
+      "name": "ExecuteSql",
+      "http": {
+        "method": "POST",
+        "requestUri": "/ExecuteSql",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ExecuteSqlRequest"
+      },
+      "output": {
+        "shape": "ExecuteSqlResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ServiceUnavailableError"
+        }
+      ],
+      "deprecated": true,
+      "documentation": "<p>Runs one or more SQL statements.</p>\n        <important>\n            <p>This operation is deprecated. Use the <code>BatchExecuteStatement</code> or\n                    <code>ExecuteStatement</code> operation.</p>\n        </important>"
+    },
+    "ExecuteStatement": {
+      "name": "ExecuteStatement",
+      "http": {
+        "method": "POST",
+        "requestUri": "/Execute",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "ExecuteStatementRequest"
+      },
+      "output": {
+        "shape": "ExecuteStatementResponse"
+      },
+      "errors": [
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "ServiceUnavailableError"
+        },
+        {
+          "shape": "StatementTimeoutException"
+        }
+      ],
+      "documentation": "<p>Runs a SQL statement against a database.</p>\n        <important>    \n            <p>If a call isn't part of a transaction because it doesn't include the\n                    <code>transactionID</code> parameter, changes that result from the call are\n                committed automatically.</p>    \n        </important>\n        <p>The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over 1,000 records, the call is terminated.</p>"
+    },
+    "RollbackTransaction": {
+      "name": "RollbackTransaction",
+      "http": {
+        "method": "POST",
+        "requestUri": "/RollbackTransaction",
+        "responseCode": 200
+      },
+      "input": {
+        "shape": "RollbackTransactionRequest"
+      },
+      "output": {
+        "shape": "RollbackTransactionResponse"
       },
       "errors": [
-          {
-            "shape": "BadRequestException"
+        {
+          "shape": "BadRequestException"
+        },
+        {
+          "shape": "ForbiddenException"
+        },
+        {
+          "shape": "InternalServerErrorException"
+        },
+        {
+          "shape": "NotFoundException"
         },
         {
-            "shape": "ForbiddenException"
-          },
-          {
-              "shape": "InternalServerErrorException"
-              },
-              {
-                "shape": "ServiceUnavailableError"
-              }
-            ],
-          "documentation": "Executes any SQL statement on the target database synchronously"
-        }
-    },
-    "shapes": {
-        "Boolean": {
-            "type": "boolean",
-              "box": true
-            },
-            "ForbiddenException": {
-          "type": "structure",
-          "members": {
-            "message": {
-                "shape": "String",
-                "documentation": "Error message"
-              }
-            },
-            "documentation": "Access denied exception",
-            "exception": true,
-        "error": {
-          "code": "ForbiddenException",
-          "httpStatusCode": 403,
-            "senderFault": true
-        }
-      },
-      "Value": {
-          "type": "structure",
-          "members": {
-          "arrayValues": {
-              "shape": "ArrayValues",
-              "documentation": "Arbitrarily nested arrays"
-          },
-          "bigIntValue": {
-              "shape": "Long",
-              "documentation": "Long value"
-            },
-                "bitValue": {
-                "shape": "Boolean",
-                "documentation": "Bit value"
-              },
-              "blobValue": {
-                  "shape": "Blob",
-                  "documentation": "Blob value"
-                },
-                "doubleValue": {
-                  "shape": "Double",
-              "documentation": "Double value"
-            },
-            "intValue": {
-                "shape": "Integer",
-                "documentation": "Integer value"
-                },
-                "isNull": {
-                    "shape": "Boolean",
-                    "documentation": "Is column null"
-                  },
-                  "realValue": {
-                  "shape": "Float",
-                    "documentation": "Float value"
-                  },
-                  "stringValue": {
-                    "shape": "String",
-                    "documentation": "String value"
-                },
-                "structValue": {
-                    "shape": "StructValue",
-                    "documentation": "Struct or UDT"
-                  }
-                },
-                "documentation": "Column value"
-            },
-              "SqlStatementResults": {
-                "type": "list",
-                "member": {
-                  "shape": "SqlStatementResult"
-              },
-              "documentation": "SQL statement execution results"
-            },
-            "ColumnMetadataList": {
-                "type": "list",
-                "member": {
-                "shape": "ColumnMetadata"
-                },
-                "documentation": "List of Column metadata"
-              },
-              "ResultFrame": {
-              "type": "structure",
-              "members": {
-                  "records": {
-                    "shape": "Records",
-                    "documentation": "ResultSet Metadata."
-                },
-                "resultSetMetadata": {
-                    "shape": "ResultSetMetadata",
-                    "documentation": "ResultSet Metadata."
-                  }
-                },
-                "documentation": "Result Frame"
-              },
-              "Long": {
-                "type": "long",
-                "box": true
-              },
-              "Row": {
-                "type": "list",
-                "member": {
-                  "shape": "Value"
-              },
-              "documentation": "List of column values"
-              },
-              "String": {
-                "type": "string"
-              },
-              "ArrayValues": {
-                "type": "list",
-              "member": {
-                  "shape": "Value"
-                },
-                "documentation": "Array value"
-              },
-              "Float": {
-              "type": "float",
-              "box": true
-            },
-            "ExecuteSqlResponse": {
-                "type": "structure",
-                "required": [
-                "sqlStatementResults"
-                ],
-                "members": {
-                  "sqlStatementResults": {
-                    "shape": "SqlStatementResults",
-                  "documentation": "Results returned by executing the sql statement(s)"
-                }
-              },
-              "documentation": "Execute SQL response"
-            },
-            "SqlStatementResult": {
-                "type": "structure",
-                "members": {
-                  "numberOfRecordsUpdated": {
-                    "shape": "Long",
-                  "documentation": "Number of rows updated."
-              },
-              "resultFrame": {
-              "shape": "ResultFrame",
-                "documentation": "ResultFrame returned by executing the sql statement"
-              }
-            },
-            "documentation": "SQL statement execution result"
-        },
-          "ResultSetMetadata": {
-            "type": "structure",
-            "members": {
-              "columnCount": {
-                "shape": "Long",
-                "documentation": "Number of columns"
-              },
-              "columnMetadata": {
-                "shape": "ColumnMetadataList",
-                "documentation": "List of columns and their types"
-              }
-            },
-            "documentation": "List of columns and their types."
-          },
-          "Records": {
-            "type": "list",
-            "member": {
-              "shape": "Record"
-            },
-            "documentation": "List of records"
-        },
-        "ExecuteSqlRequest": {
-            "type": "structure",
-            "required": [
-                  "awsSecretStoreArn",
-                  "dbClusterOrInstanceArn",
-                  "sqlStatements"
-              ],
-            "members": {
-              "awsSecretStoreArn": {
-              "shape": "Arn",
-                "documentation": "ARN of the db credentials in AWS Secret Store or the friendly secret name"
-              },
-                "database": {
-                  "shape": "DbName",
-                  "documentation": "Target DB name"
-                },
-                "dbClusterOrInstanceArn": {
-                  "shape": "Arn",
-                "documentation": "ARN of the target db cluster or instance"
-          },
+          "shape": "ServiceUnavailableError"
+        }
+      ],
+      "documentation": "<p>Performs a rollback of a transaction. Rolling back a transaction cancels its changes.</p>"
+    }
+  },
+  "shapes": {
+    "SqlStatementResults": {
+      "type": "list",
+      "member": {
+        "shape": "SqlStatementResult"
+      }
+    },
+    "ResultFrame": {
+      "type": "structure",
+      "members": {
+        "records": {
+          "shape": "Records",
+          "documentation": "<p>The records in the result set.</p>"
+        },
+        "resultSetMetadata": {
+          "shape": "ResultSetMetadata",
+          "documentation": "<p>The result-set metadata in the result set.</p>"
+        }
+      },
+      "documentation": "<p>The result set returned by a SQL statement.</p>"
+    },
+    "SqlParameterSets": {
+      "type": "list",
+      "member": {
+        "shape": "SqlParametersList"
+      }
+    },
+    "NotFoundException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "ErrorMessage",
+          "documentation": "<p>The error message returned by this <code>NotFoundException</code> error.</p>"
+        }
+      },
+      "documentation": "<p>The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.</p>",
+      "exception": true,
+      "error": {
+        "code": "NotFoundException",
+        "httpStatusCode": 404,
+        "senderFault": true
+      }
+    },
+    "BatchExecuteStatementRequest": {
+      "type": "structure",
+      "required": [
+        "resourceArn",
+        "secretArn",
+        "sql"
+      ],
+      "members": {
+        "database": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database.</p>"
+        },
+        "parameterSets": {
+          "shape": "SqlParameterSets",
+          "documentation": "<p>The parameter set for the batch operation.</p>"
+        },
+        "resourceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>"
+        },
+        "schema": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database schema.</p>"
+        },
+        "secretArn": {
+          "shape": "Arn",
+          "documentation": "<p>The name or ARN of the secret that enables access to the DB cluster.</p>"
+        },
+        "sql": {
+          "shape": "SqlStatement",
+          "documentation": "<p>The SQL statement to run.</p>"
+        },
+        "transactionId": {
+          "shape": "Id",
+          "documentation": "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this\n            parameter.</p>"
+        }
+      },
+      "documentation": "<p>The request parameters represent the input of a SQL statement over an array of\n            data.</p>"
+    },
+    "ArrayValueList": {
+      "type": "list",
+      "member": {
+        "shape": "Value"
+      }
+    },
+    "UpdateResults": {
+      "type": "list",
+      "member": {
+        "shape": "UpdateResult"
+      }
+    },
+    "Row": {
+      "type": "list",
+      "member": {
+        "shape": "Value"
+      }
+    },
+    "SqlRecords": {
+      "type": "list",
+      "member": {
+        "shape": "FieldList"
+      }
+    },
+    "Long": {
+      "type": "long"
+    },
+    "BoxedInteger": {
+      "type": "integer",
+      "box": true
+    },
+    "CommitTransactionResponse": {
+      "type": "structure",
+      "members": {
+        "transactionStatus": {
+          "shape": "TransactionStatus",
+          "documentation": "<p>The status of the commit operation.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the output of a commit transaction request.</p>"
+    },
+    "Integer": {
+      "type": "integer"
+    },
+    "BoxedLong": {
+      "type": "long",
+      "box": true
+    },
+    "SqlParameter": {
+      "type": "structure",
+      "members": {
+        "name": {
+          "shape": "ParameterName",
+          "documentation": "<p>The name of the parameter.</p>"
+        },
+        "value": {
+          "shape": "Field",
+          "documentation": "<p>The value of the parameter.</p>"
+        }
+      },
+      "documentation": "<p>A parameter used in a SQL statement.</p>"
+    },
+    "Field": {
+      "type": "structure",
+      "members": {
+        "blobValue": {
+          "shape": "Blob",
+          "documentation": "<p>A value of BLOB data type.</p>"
+        },
+        "booleanValue": {
+          "shape": "BoxedBoolean",
+          "documentation": "<p>A value of Boolean data type.</p>"
+        },
+        "doubleValue": {
+          "shape": "BoxedDouble",
+          "documentation": "<p>A value of double data type.</p>"
+        },
+        "isNull": {
+          "shape": "BoxedBoolean",
+          "documentation": "<p>A NULL value.</p>"
+        },
+        "longValue": {
+          "shape": "BoxedLong",
+          "documentation": "<p>A value of long data type.</p>"
+        },
+        "stringValue": {
+          "shape": "String",
+          "documentation": "<p>A value of string data type.</p>"
+        }
+      },
+      "documentation": "<p>Contains a value.</p>"
+    },
+    "ExecuteSqlRequest": {
+      "type": "structure",
+      "required": [
+        "awsSecretStoreArn",
+        "dbClusterOrInstanceArn",
+        "sqlStatements"
+      ],
+      "members": {
+        "awsSecretStoreArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.</p>"
+        },
+        "database": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database.</p>"
+        },
+        "dbClusterOrInstanceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The ARN of the Aurora Serverless DB cluster.</p>"
+        },
         "schema": {
           "shape": "DbName",
-          "documentation": "Target Schema name"
+          "documentation": "<p>The name of the database schema.</p>"
         },
         "sqlStatements": {
           "shape": "SqlStatement",
-          "documentation": "SQL statement(s) to be executed. Statements can be chained by using semicolons"
+          "documentation": "<p>One or more SQL statements to run on the DB cluster.</p>\n        <p>You can separate SQL statements from each other with a semicolon (;). Any valid SQL\n            statement is permitted, including data definition, data manipulation, and commit\n            statements. </p>"
         }
       },
-      "documentation": "Execute SQL Request"
+      "documentation": "<p>The request parameters represent the input of a request to run one or more SQL\n            statements.</p>"
     },
     "Arn": {
       "type": "string",
-      "max": 1024
+      "max": 100
     },
     "StructValue": {
       "type": "structure",
       "members": {
         "attributes": {
-          "shape": "ArrayValues",
-          "documentation": "Struct or UDT"
+          "shape": "ArrayValueList",
+          "documentation": "<p>The attributes returned in the record.</p>"
         }
       },
-      "documentation": "User Defined Type"
+      "documentation": "<p>A structure value returned by a call.</p>"
+    },
+    "Boolean": {
+      "type": "boolean"
     },
     "BadRequestException": {
       "type": "structure",
       "members": {
         "message": {
-          "shape": "String",
-          "documentation": "Error message"
+          "shape": "ErrorMessage",
+          "documentation": "<p>The error message returned by this <code>BadRequestException</code> error.</p>"
         }
       },
-      "documentation": "Invalid Request exception",
+      "documentation": "<p>There is an error in the call or in a SQL statement.</p>",
       "exception": true,
       "error": {
         "code": "BadRequestException",
@@ -272,21 +442,384 @@
         "senderFault": true
       }
     },
-    "Blob": {
-      "type": "blob"
+    "TransactionStatus": {
+      "type": "string",
+      "max": 128
     },
     "SqlStatement": {
       "type": "string",
       "max": 65536
     },
-    "Double": {
+    "RollbackTransactionRequest": {
+      "type": "structure",
+      "required": [
+        "resourceArn",
+        "secretArn",
+        "transactionId"
+      ],
+      "members": {
+        "resourceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>"
+        },
+        "secretArn": {
+          "shape": "Arn",
+          "documentation": "<p>The name or ARN of the secret that enables access to the DB cluster.</p>"
+        },
+        "transactionId": {
+          "shape": "Id",
+          "documentation": "<p>The identifier of the transaction to roll back.</p>"
+        }
+      },
+      "documentation": "<p>The request parameters represent the input of a request to perform a rollback of a\n            transaction.</p>"
+    },
+    "ErrorMessage": {
+      "type": "string"
+    },
+    "Record": {
+      "type": "structure",
+      "members": {
+        "values": {
+          "shape": "Row",
+          "documentation": "<p>The values returned in the record.</p>"
+        }
+      },
+      "documentation": "<p>A record returned by a call.</p>"
+    },
+    "BoxedFloat": {
+      "type": "float",
+      "box": true
+    },
+    "BoxedDouble": {
       "type": "double",
       "box": true
     },
+    "ForbiddenException": {
+      "type": "structure",
+      "members": {
+        "message": {
+          "shape": "ErrorMessage",
+          "documentation": "<p>The error message returned by this <code>ForbiddenException</code> error.</p>"
+        }
+      },
+      "documentation": "<p>There are insufficient privileges to make the call.</p>",
+      "exception": true,
+      "error": {
+        "code": "ForbiddenException",
+        "httpStatusCode": 403,
+        "senderFault": true
+      }
+    },
+    "Value": {
+      "type": "structure",
+      "members": {
+        "arrayValues": {
+          "shape": "ArrayValueList",
+          "documentation": "<p>An array of column values.</p>"
+        },
+        "bigIntValue": {
+          "shape": "BoxedLong",
+          "documentation": "<p>A value for a column of big integer data type.</p>"
+        },
+        "bitValue": {
+          "shape": "BoxedBoolean",
+          "documentation": "<p>A value for a column of BIT data type.</p>"
+        },
+        "blobValue": {
+          "shape": "Blob",
+          "documentation": "<p>A value for a column of BLOB data type.</p>"
+        },
+        "doubleValue": {
+          "shape": "BoxedDouble",
+          "documentation": "<p>A value for a column of double data type.</p>"
+        },
+        "intValue": {
+          "shape": "BoxedInteger",
+          "documentation": "<p>A value for a column of integer data type.</p>"
+        },
+        "isNull": {
+          "shape": "BoxedBoolean",
+          "documentation": "<p>A NULL value.</p>"
+        },
+        "realValue": {
+          "shape": "BoxedFloat",
+          "documentation": "<p>A value for a column of real data type.</p>"
+        },
+        "stringValue": {
+          "shape": "String",
+          "documentation": "<p>A value for a column of string data type.</p>"
+        },
+        "structValue": {
+          "shape": "StructValue",
+          "documentation": "<p>A value for a column of STRUCT data type.</p>"
+        }
+      },
+      "documentation": "<p>Contains the value of a column.</p>"
+    },
+    "FieldList": {
+      "type": "list",
+      "member": {
+        "shape": "Field"
+      }
+    },
+    "StatementTimeoutException": {
+      "type": "structure",
+      "members": {
+        "dbConnectionId": {
+          "shape": "Long",
+          "documentation": "<p>The database connection ID that executed the SQL statement.</p>"
+        },
+        "message": {
+          "shape": "ErrorMessage",
+          "documentation": "<p>The error message returned by this <code>StatementTimeoutException</code> error.</p>"
+        }
+      },
+      "documentation": "<p>The execution of the SQL statement timed out.</p>",
+      "exception": true,
+      "error": {
+        "code": "StatementTimeoutException",
+        "httpStatusCode": 400,
+        "senderFault": true
+      }
+    },
+    "ExecuteStatementResponse": {
+      "type": "structure",
+      "members": {
+        "columnMetadata": {
+          "shape": "Metadata",
+          "documentation": "<p>Metadata for the columns included in the results.</p>"
+        },
+        "generatedFields": {
+          "shape": "FieldList",
+          "documentation": "<p>Values for fields generated during the request.</p>"
+        },
+        "numberOfRecordsUpdated": {
+          "shape": "RecordsUpdated",
+          "documentation": "<p>The number of records updated by the request.</p>"
+        },
+        "records": {
+          "shape": "SqlRecords",
+          "documentation": "<p>The records returned by the SQL statement.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the output of a request to run a SQL statement against\n            a database.</p>"
+    },
+    "BoxedBoolean": {
+      "type": "boolean",
+      "box": true
+    },
+    "RecordsUpdated": {
+      "type": "long"
+    },
+    "UpdateResult": {
+      "type": "structure",
+      "members": {
+        "generatedFields": {
+          "shape": "FieldList",
+          "documentation": "<p>Values for fields generated during the request.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the results of an update.</p>"
+    },
+    "SqlParametersList": {
+      "type": "list",
+      "member": {
+        "shape": "SqlParameter"
+      }
+    },
+    "ParameterName": {
+      "type": "string"
+    },
+    "Metadata": {
+      "type": "list",
+      "member": {
+        "shape": "ColumnMetadata"
+      }
+    },
+    "ExecuteSqlResponse": {
+      "type": "structure",
+      "members": {
+        "sqlStatementResults": {
+          "shape": "SqlStatementResults",
+          "documentation": "<p>The results of the SQL statement or statements.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the output of a request to run one or more SQL\n            statements.</p>"
+    },
+    "SqlStatementResult": {
+      "type": "structure",
+      "members": {
+        "numberOfRecordsUpdated": {
+          "shape": "RecordsUpdated",
+          "documentation": "<p>The number of records updated by a SQL statement.</p>"
+        },
+        "resultFrame": {
+          "shape": "ResultFrame",
+          "documentation": "<p>The result set of the SQL statement.</p>"
+        }
+      },
+      "documentation": "<p>The result of a SQL statement.</p>"
+    },
+    "BeginTransactionRequest": {
+      "type": "structure",
+      "required": [
+        "resourceArn",
+        "secretArn"
+      ],
+      "members": {
+        "database": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database.</p>"
+        },
+        "resourceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>"
+        },
+        "schema": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database schema.</p>"
+        },
+        "secretArn": {
+          "shape": "Arn",
+          "documentation": "<p>The name or ARN of the secret that enables access to the DB cluster.</p>"
+        }
+      },
+      "documentation": "<p>The request parameters represent the input of a request to start a SQL\n            transaction.</p>"
+    },
+    "RollbackTransactionResponse": {
+      "type": "structure",
+      "members": {
+        "transactionStatus": {
+          "shape": "TransactionStatus",
+          "documentation": "<p>The status of the rollback operation.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the output of a request to perform a rollback of a\n            transaction.</p>"
+    },
+    "BatchExecuteStatementResponse": {
+      "type": "structure",
+      "members": {
+        "updateResults": {
+          "shape": "UpdateResults",
+          "documentation": "<p>The execution results of each batch entry.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the output of a SQL statement over an array of\n            data.</p>"
+    },
+    "ResultSetMetadata": {
+      "type": "structure",
+      "members": {
+        "columnCount": {
+          "shape": "Long",
+          "documentation": "<p>The number of columns in the result set.</p>"
+        },
+        "columnMetadata": {
+          "shape": "Metadata",
+          "documentation": "<p>The metadata of the columns in the result set.</p>"
+        }
+      },
+      "documentation": "<p>The metadata of the result set returned by a SQL statement.</p>"
+    },
+    "Records": {
+      "type": "list",
+      "member": {
+        "shape": "Record"
+      }
+    },
+    "ExecuteStatementRequest": {
+      "type": "structure",
+      "required": [
+        "resourceArn",
+        "secretArn",
+        "sql"
+      ],
+      "members": {
+        "continueAfterTimeout": {
+          "shape": "Boolean",
+          "documentation": "<p>A value that indicates whether to continue running the statement after \n            the call times out. By default, the statement stops running when the call \n            times out.</p>\n        <important>\n            <p>For DDL statements, we recommend continuing to run the statement after \n               the call times out. When a DDL statement terminates before it is finished \n               running, it can result in errors and possibly corrupted data structures.</p>\n        </important>"
+        },
+        "database": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database.</p>"
+        },
+        "includeResultMetadata": {
+          "shape": "Boolean",
+          "documentation": "<p>A value that indicates whether to include metadata in the results.</p>"
+        },
+        "parameters": {
+          "shape": "SqlParametersList",
+          "documentation": "<p>The parameters for the SQL statement.</p>"
+        },
+        "resourceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>"
+        },
+        "schema": {
+          "shape": "DbName",
+          "documentation": "<p>The name of the database schema.</p>"
+        },
+        "secretArn": {
+          "shape": "Arn",
+          "documentation": "<p>The name or ARN of the secret that enables access to the DB cluster.</p>"
+        },
+        "sql": {
+          "shape": "SqlStatement",
+          "documentation": "<p>The SQL statement to run.</p>"
+        },
+        "transactionId": {
+          "shape": "Id",
+          "documentation": "<p>The identifier of a transaction that was started by using the\n                <code>BeginTransaction</code> operation. Specify the transaction ID of the\n            transaction that you want to include the SQL statement in.</p>\n        <p>If the SQL statement is not part of a transaction, don't set this parameter.</p>"
+        }
+      },
+      "documentation": "<p>The request parameters represent the input of a request to run a SQL statement against\n            a database.</p>"
+    },
+    "Blob": {
+      "type": "blob"
+    },
+    "String": {
+      "type": "string"
+    },
+    "BeginTransactionResponse": {
+      "type": "structure",
+      "members": {
+        "transactionId": {
+          "shape": "Id",
+          "documentation": "<p>The transaction ID of the transaction started by the call.</p>"
+        }
+      },
+      "documentation": "<p>The response elements represent the output of a request to start a SQL\n            transaction.</p>"
+    },
+    "Id": {
+      "type": "string",
+      "max": 192
+    },
+    "CommitTransactionRequest": {
+      "type": "structure",
+      "required": [
+        "resourceArn",
+        "secretArn",
+        "transactionId"
+      ],
+      "members": {
+        "resourceArn": {
+          "shape": "Arn",
+          "documentation": "<p>The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.</p>"
+        },
+        "secretArn": {
+          "shape": "Arn",
+          "documentation": "<p>The name or ARN of the secret that enables access to the DB cluster.</p>"
+        },
+        "transactionId": {
+          "shape": "Id",
+          "documentation": "<p>The identifier of the transaction to end and commit.</p>"
+        }
+      },
+      "documentation": "<p>The request parameters represent the input of a commit transaction request.</p>"
+    },
     "ServiceUnavailableError": {
       "type": "structure",
       "members": { },
-      "documentation": "Internal service unavailable error",
+      "documentation": "<p>The service specified by the <code>resourceArn</code> parameter is not\n            available.</p>",
       "exception": true,
       "error": {
         "code": "ServiceUnavailableError",
@@ -299,85 +832,71 @@
       "members": {
         "arrayBaseColumnType": {
           "shape": "Integer",
-          "documentation": "Homogenous array base SQL type from java.sql.Types."
+          "documentation": "<p>The type of the column.</p>"
         },
         "isAutoIncrement": {
           "shape": "Boolean",
-          "documentation": "Whether the designated column is automatically numbered"
+          "documentation": "<p>A value that indicates whether the column increments automatically.</p>"
         },
         "isCaseSensitive": {
           "shape": "Boolean",
-          "documentation": "Whether values in the designated column's case matters"
+          "documentation": "<p>A value that indicates whether the column is case-sensitive.</p>"
         },
         "isCurrency": {
           "shape": "Boolean",
-          "documentation": "Whether values in the designated column is a cash value"
+          "documentation": "<p>A value that indicates whether the column contains currency values.</p>"
         },
         "isSigned": {
           "shape": "Boolean",
-          "documentation": "Whether values in the designated column are signed numbers"
+          "documentation": "<p>A value that indicates whether an integer column is signed.</p>"
         },
         "label": {
           "shape": "String",
-          "documentation": "Usually specified by the SQL AS. If not specified, return column name."
+          "documentation": "<p>The label for the column.</p>"
         },
         "name": {
           "shape": "String",
-          "documentation": "Name of the column."
+          "documentation": "<p>The name of the column.</p>"
         },
         "nullable": {
           "shape": "Integer",
-          "documentation": "Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1), columnNullableUnknown (2)"
+          "documentation": "<p>A value that indicates whether the column is nullable.</p>"
         },
         "precision": {
           "shape": "Integer",
-          "documentation": "Get the designated column's specified column size.For numeric data, this is the maximum precision.  For character data, this is the length in characters. For datetime datatypes, this is the length in characters of the String representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this is the length in bytes.  For the ROWID datatype, this is the length in bytes. 0 is returned for data types where the column size is not applicable."
+          "documentation": "<p>The precision value of a decimal number column.</p>"
         },
         "scale": {
           "shape": "Integer",
-          "documentation": "Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale is not applicable."
+          "documentation": "<p>The scale value of a decimal number column.</p>"
         },
         "schemaName": {
           "shape": "String",
-          "documentation": "Designated column's table's schema"
+          "documentation": "<p>The name of the schema that owns the table that includes the column.</p>"
         },
         "tableName": {
           "shape": "String",
-          "documentation": "Designated column's table name"
+          "documentation": "<p>The name of the table that includes the column.</p>"
         },
         "type": {
           "shape": "Integer",
-          "documentation": "SQL type from java.sql.Types."
+          "documentation": "<p>The type of the column.</p>"
         },
         "typeName": {
           "shape": "String",
-          "documentation": "Database-specific type name."
+          "documentation": "<p>The database-specific data type of the column.</p>"
         }
       },
-      "documentation": "Column Metadata"
-    },
-    "Integer": {
-      "type": "integer",
-      "box": true
+      "documentation": "<p>Contains the metadata for a column.</p>"
     },
     "DbName": {
       "type": "string",
       "max": 64
     },
-    "Record": {
-      "type": "structure",
-      "members": {
-        "values": {
-          "shape": "Row",
-          "documentation": "Record"
-        }
-      },
-      "documentation": "Row or Record"
-    },
     "InternalServerErrorException": {
       "type": "structure",
       "members": { },
-      "documentation": "Internal service error",
+      "documentation": "<p>An internal error occurred.</p>",
       "exception": true,
       "error": {
         "code": "InternalServerErrorException",
diff --git a/aws-java-sdk-models/src/main/resources/models/runtime.lex-2016-11-28-intermediate.json b/aws-java-sdk-models/src/main/resources/models/runtime.lex-2016-11-28-intermediate.json
index 00e43b62ee78..2d3a6f8ffaf5 100644
--- a/aws-java-sdk-models/src/main/resources/models/runtime.lex-2016-11-28-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/runtime.lex-2016-11-28-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientConstructors", "ClientMutationMethods", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : {
       "PostContentResponse" : [ "dialogState" ],
       "PostTextResponse" : [ "dialogState" ],
diff --git a/aws-java-sdk-models/src/main/resources/models/securityhub-2018-10-26-intermediate.json b/aws-java-sdk-models/src/main/resources/models/securityhub-2018-10-26-intermediate.json
index 2c6a8ec1640e..eac1626452a4 100644
--- a/aws-java-sdk-models/src/main/resources/models/securityhub-2018-10-26-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/securityhub-2018-10-26-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-intermediate.json b/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-intermediate.json
index 5877b52ea4b0..1028f37f6fb5 100644
--- a/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-intermediate.json
@@ -2775,6 +2775,46 @@
       },
       "syncReturnType" : "ListServiceActionsForProvisioningArtifactResult"
     },
+    "ListStackInstancesForProvisionedProduct" : {
+      "asyncCallableType" : "java.util.concurrent.Callable<ListStackInstancesForProvisionedProductResult>",
+      "asyncFutureType" : "java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult>",
+      "asyncHandlerType" : "com.amazonaws.handlers.AsyncHandler<ListStackInstancesForProvisionedProductRequest, ListStackInstancesForProvisionedProductResult>",
+      "asyncReturnType" : "ListStackInstancesForProvisionedProductResult",
+      "authenticated" : true,
+      "deprecated" : false,
+      "documentation" : "<p>Returns summary information about stack instances that are associated with the specified <code>CFN_STACKSET</code> type provisioned product. You can filter for stack instances that are associated with a specific AWS account name or region. </p>",
+      "endpointDiscovery" : null,
+      "endpointOperation" : false,
+      "endpointTrait" : null,
+      "exceptions" : [ {
+        "exceptionName" : "InvalidParametersException",
+        "documentation" : "<p>One or more parameters provided to the operation are not valid.</p>",
+        "httpStatusCode" : null
+      }, {
+        "exceptionName" : "ResourceNotFoundException",
+        "documentation" : "<p>The specified resource was not found.</p>",
+        "httpStatusCode" : null
+      } ],
+      "hasBlobMemberAsPayload" : false,
+      "hostPrefixProcessor" : null,
+      "input" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListStackInstancesForProvisionedProductRequest",
+        "variableName" : "listStackInstancesForProvisionedProductRequest",
+        "variableType" : "ListStackInstancesForProvisionedProductRequest",
+        "documentation" : "",
+        "simpleType" : "ListStackInstancesForProvisionedProductRequest",
+        "variableSetterType" : "ListStackInstancesForProvisionedProductRequest"
+      },
+      "inputStreamPropertyName" : null,
+      "methodName" : "listStackInstancesForProvisionedProduct",
+      "operationName" : "ListStackInstancesForProvisionedProduct",
+      "returnType" : {
+        "returnType" : "ListStackInstancesForProvisionedProductResult",
+        "documentation" : null
+      },
+      "syncReturnType" : "ListStackInstancesForProvisionedProductResult"
+    },
     "ListTagOptions" : {
       "asyncCallableType" : "java.util.concurrent.Callable<ListTagOptionsResult>",
       "asyncFutureType" : "java.util.concurrent.Future<ListTagOptionsResult>",
@@ -61977,16 +62017,1213 @@
           },
           "xmlNameSpaceUri" : null
         },
-        "ResourceType" : {
-          "c2jName" : "ResourceType",
-          "c2jShape" : "ResourceType",
+        "ResourceType" : {
+          "c2jName" : "ResourceType",
+          "c2jShape" : "ResourceType",
+          "deprecated" : false,
+          "documentation" : "<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@param resourceType The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceType",
+          "getterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@return The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>*/",
+          "getterMethodName" : "getResourceType",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ResourceType",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ResourceType",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ResourceType",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@param resourceType The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>*/",
+          "setterMethodName" : "setResourceType",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceType",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@param resourceType The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "resourceType",
+            "variableType" : "String",
+            "documentation" : "<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "TagOptionId" : {
+          "c2jName" : "TagOptionId",
+          "c2jShape" : "TagOptionId",
+          "deprecated" : false,
+          "documentation" : "<p>The TagOption identifier.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The TagOption identifier.</p>\n@param tagOptionId The TagOption identifier.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withTagOptionId",
+          "getterDocumentation" : "/**<p>The TagOption identifier.</p>\n@return The TagOption identifier.*/",
+          "getterMethodName" : "getTagOptionId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "TagOptionId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "TagOptionId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "TagOptionId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The TagOption identifier.</p>\n@param tagOptionId The TagOption identifier.*/",
+          "setterMethodName" : "setTagOptionId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tagOptionId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The TagOption identifier.</p>\n@param tagOptionId The TagOption identifier.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "tagOptionId",
+            "variableType" : "String",
+            "documentation" : "<p>The TagOption identifier.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : [ "TagOptionId" ],
+      "shapeName" : "ListResourcesForTagOptionRequest",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : null,
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListResourcesForTagOptionRequest",
+        "variableName" : "listResourcesForTagOptionRequest",
+        "variableType" : "ListResourcesForTagOptionRequest",
+        "documentation" : null,
+        "simpleType" : "ListResourcesForTagOptionRequest",
+        "variableSetterType" : "ListResourcesForTagOptionRequest"
+      },
+      "wrapper" : false
+    },
+    "ListResourcesForTagOptionResult" : {
+      "c2jName" : "ListResourcesForTagOptionOutput",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "ResourceDetails",
+        "c2jShape" : "ResourceDetails",
+        "deprecated" : false,
+        "documentation" : "<p>Information about the resources.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withResourceDetails",
+        "getterDocumentation" : "/**<p>Information about the resources.</p>\n@return Information about the resources.*/",
+        "getterMethodName" : "getResourceDetails",
+        "getterModel" : {
+          "returnType" : "java.util.List<ResourceDetail>",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ResourceDetails",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ResourceDetails",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : true,
+        "listModel" : {
+          "implType" : "java.util.ArrayList",
+          "interfaceType" : "java.util.List",
+          "listMemberModel" : {
+            "c2jName" : "member",
+            "c2jShape" : "ResourceDetail",
+            "deprecated" : false,
+            "documentation" : "",
+            "enumType" : null,
+            "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "fluentSetterMethodName" : "withMember",
+            "getterDocumentation" : "/**\n@return */",
+            "getterMethodName" : "getMember",
+            "getterModel" : {
+              "returnType" : "ResourceDetail",
+              "documentation" : null
+            },
+            "http" : {
+              "additionalMarshallingPath" : null,
+              "additionalUnmarshallingPath" : null,
+              "flattened" : false,
+              "greedy" : false,
+              "header" : false,
+              "isPayload" : false,
+              "isStreaming" : false,
+              "location" : null,
+              "marshallLocation" : "PAYLOAD",
+              "marshallLocationName" : "member",
+              "queryString" : false,
+              "requiresLength" : false,
+              "statusCode" : false,
+              "unmarshallLocationName" : "member",
+              "uri" : false
+            },
+            "idempotencyToken" : false,
+            "isBinary" : false,
+            "jsonValue" : false,
+            "list" : false,
+            "listModel" : null,
+            "map" : false,
+            "mapModel" : null,
+            "marshallingTargetClass" : "StructuredPojo",
+            "marshallingType" : "STRUCTURED",
+            "name" : "Member",
+            "sensitive" : false,
+            "setterDocumentation" : "/**\n@param member */",
+            "setterMethodName" : "setMember",
+            "setterModel" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ResourceDetail",
+              "variableName" : "member",
+              "variableType" : "ResourceDetail",
+              "documentation" : "",
+              "simpleType" : "ResourceDetail",
+              "variableSetterType" : "ResourceDetail"
+            },
+            "shouldEmitLegacyEnumSetter" : false,
+            "simple" : false,
+            "unmarshallingType" : null,
+            "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+            "variable" : {
+              "timestampFormat" : null,
+              "variableDeclarationType" : "ResourceDetail",
+              "variableName" : "member",
+              "variableType" : "ResourceDetail",
+              "documentation" : "",
+              "simpleType" : "ResourceDetail",
+              "variableSetterType" : "ResourceDetail"
+            },
+            "xmlNameSpaceUri" : null
+          },
+          "memberLocationName" : null,
+          "memberType" : "ResourceDetail",
+          "map" : false,
+          "marshallNonAutoConstructedEmptyLists" : false,
+          "memberAdditionalMarshallingPath" : null,
+          "memberAdditionalUnmarshallingPath" : null,
+          "sendEmptyQueryString" : false,
+          "simple" : false,
+          "simpleType" : "ResourceDetail",
+          "templateImplType" : "java.util.ArrayList<ResourceDetail>",
+          "templateType" : "java.util.List<ResourceDetail>"
+        },
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "List",
+        "marshallingType" : "LIST",
+        "name" : "ResourceDetails",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.*/",
+        "setterMethodName" : "setResourceDetails",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ResourceDetail>",
+          "variableName" : "resourceDetails",
+          "variableType" : "java.util.List<ResourceDetail>",
+          "documentation" : "",
+          "simpleType" : "List<ResourceDetail>",
+          "variableSetterType" : "java.util.Collection<ResourceDetail>"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : false,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>Information about the resources.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setResourceDetails(java.util.Collection)} or {@link #withResourceDetails(java.util.Collection)} if you want to override the existing values.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "java.util.List<ResourceDetail>",
+          "variableName" : "resourceDetails",
+          "variableType" : "java.util.List<ResourceDetail>",
+          "documentation" : "<p>Information about the resources.</p>",
+          "simpleType" : "List<ResourceDetail>",
+          "variableSetterType" : "java.util.Collection<ResourceDetail>"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "PageToken",
+        "c2jShape" : "PageToken",
+        "deprecated" : false,
+        "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPageToken",
+        "getterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@return The page token for the next set of results. To retrieve the first set of results, use null.*/",
+        "getterMethodName" : "getPageToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "PageToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "PageToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "PageToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.*/",
+        "setterMethodName" : "setPageToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pageToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pageToken",
+          "variableType" : "String",
+          "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "PageToken" : {
+          "c2jName" : "PageToken",
+          "c2jShape" : "PageToken",
+          "deprecated" : false,
+          "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPageToken",
+          "getterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@return The page token for the next set of results. To retrieve the first set of results, use null.*/",
+          "getterMethodName" : "getPageToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "PageToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "PageToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "PageToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.*/",
+          "setterMethodName" : "setPageToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pageToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pageToken",
+            "variableType" : "String",
+            "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ResourceDetails" : {
+          "c2jName" : "ResourceDetails",
+          "c2jShape" : "ResourceDetails",
+          "deprecated" : false,
+          "documentation" : "<p>Information about the resources.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withResourceDetails",
+          "getterDocumentation" : "/**<p>Information about the resources.</p>\n@return Information about the resources.*/",
+          "getterMethodName" : "getResourceDetails",
+          "getterModel" : {
+            "returnType" : "java.util.List<ResourceDetail>",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ResourceDetails",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ResourceDetails",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : true,
+          "listModel" : {
+            "implType" : "java.util.ArrayList",
+            "interfaceType" : "java.util.List",
+            "listMemberModel" : {
+              "c2jName" : "member",
+              "c2jShape" : "ResourceDetail",
+              "deprecated" : false,
+              "documentation" : "",
+              "enumType" : null,
+              "fluentSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "fluentSetterMethodName" : "withMember",
+              "getterDocumentation" : "/**\n@return */",
+              "getterMethodName" : "getMember",
+              "getterModel" : {
+                "returnType" : "ResourceDetail",
+                "documentation" : null
+              },
+              "http" : {
+                "additionalMarshallingPath" : null,
+                "additionalUnmarshallingPath" : null,
+                "flattened" : false,
+                "greedy" : false,
+                "header" : false,
+                "isPayload" : false,
+                "isStreaming" : false,
+                "location" : null,
+                "marshallLocation" : "PAYLOAD",
+                "marshallLocationName" : "member",
+                "queryString" : false,
+                "requiresLength" : false,
+                "statusCode" : false,
+                "unmarshallLocationName" : "member",
+                "uri" : false
+              },
+              "idempotencyToken" : false,
+              "isBinary" : false,
+              "jsonValue" : false,
+              "list" : false,
+              "listModel" : null,
+              "map" : false,
+              "mapModel" : null,
+              "marshallingTargetClass" : "StructuredPojo",
+              "marshallingType" : "STRUCTURED",
+              "name" : "Member",
+              "sensitive" : false,
+              "setterDocumentation" : "/**\n@param member */",
+              "setterMethodName" : "setMember",
+              "setterModel" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ResourceDetail",
+                "variableName" : "member",
+                "variableType" : "ResourceDetail",
+                "documentation" : "",
+                "simpleType" : "ResourceDetail",
+                "variableSetterType" : "ResourceDetail"
+              },
+              "shouldEmitLegacyEnumSetter" : false,
+              "simple" : false,
+              "unmarshallingType" : null,
+              "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
+              "variable" : {
+                "timestampFormat" : null,
+                "variableDeclarationType" : "ResourceDetail",
+                "variableName" : "member",
+                "variableType" : "ResourceDetail",
+                "documentation" : "",
+                "simpleType" : "ResourceDetail",
+                "variableSetterType" : "ResourceDetail"
+              },
+              "xmlNameSpaceUri" : null
+            },
+            "memberLocationName" : null,
+            "memberType" : "ResourceDetail",
+            "map" : false,
+            "marshallNonAutoConstructedEmptyLists" : false,
+            "memberAdditionalMarshallingPath" : null,
+            "memberAdditionalUnmarshallingPath" : null,
+            "sendEmptyQueryString" : false,
+            "simple" : false,
+            "simpleType" : "ResourceDetail",
+            "templateImplType" : "java.util.ArrayList<ResourceDetail>",
+            "templateType" : "java.util.List<ResourceDetail>"
+          },
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "List",
+          "marshallingType" : "LIST",
+          "name" : "ResourceDetails",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.*/",
+          "setterMethodName" : "setResourceDetails",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ResourceDetail>",
+            "variableName" : "resourceDetails",
+            "variableType" : "java.util.List<ResourceDetail>",
+            "documentation" : "",
+            "simpleType" : "List<ResourceDetail>",
+            "variableSetterType" : "java.util.Collection<ResourceDetail>"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : false,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>Information about the resources.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setResourceDetails(java.util.Collection)} or {@link #withResourceDetails(java.util.Collection)} if you want to override the existing values.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "java.util.List<ResourceDetail>",
+            "variableName" : "resourceDetails",
+            "variableType" : "java.util.List<ResourceDetail>",
+            "documentation" : "<p>Information about the resources.</p>",
+            "simpleType" : "List<ResourceDetail>",
+            "variableSetterType" : "java.util.Collection<ResourceDetail>"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "ListResourcesForTagOptionResult",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "ListResourcesForTagOptionResult",
+        "variableName" : "listResourcesForTagOptionResult",
+        "variableType" : "ListResourcesForTagOptionResult",
+        "documentation" : null,
+        "simpleType" : "ListResourcesForTagOptionResult",
+        "variableSetterType" : "ListResourcesForTagOptionResult"
+      },
+      "wrapper" : false
+    },
+    "ListServiceActionsForProvisioningArtifactRequest" : {
+      "c2jName" : "ListServiceActionsForProvisioningArtifactInput",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : {
+        "action" : "ListServiceActionsForProvisioningArtifact",
+        "locationName" : null,
+        "requestUri" : "/",
+        "target" : "AWS242ServiceCatalogService.ListServiceActionsForProvisioningArtifact",
+        "verb" : "POST",
+        "xmlNameSpaceUri" : null
+      },
+      "members" : [ {
+        "c2jName" : "ProductId",
+        "c2jShape" : "Id",
+        "deprecated" : false,
+        "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withProductId",
+        "getterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@return The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
+        "getterMethodName" : "getProductId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ProductId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ProductId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ProductId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
+        "setterMethodName" : "setProductId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "productId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "productId",
+          "variableType" : "String",
+          "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "ProvisioningArtifactId",
+        "c2jShape" : "Id",
+        "deprecated" : false,
+        "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withProvisioningArtifactId",
+        "getterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@return The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
+        "getterMethodName" : "getProvisioningArtifactId",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "ProvisioningArtifactId",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "ProvisioningArtifactId",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ProvisioningArtifactId",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
+        "setterMethodName" : "setProvisioningArtifactId",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "provisioningArtifactId",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "provisioningArtifactId",
+          "variableType" : "String",
+          "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "PageSize",
+        "c2jShape" : "PageSize",
+        "deprecated" : false,
+        "documentation" : "<p>The maximum number of items to return with this call.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPageSize",
+        "getterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@return The maximum number of items to return with this call.*/",
+        "getterMethodName" : "getPageSize",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "PageSize",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "PageSize",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "PageSize",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.*/",
+        "setterMethodName" : "setPageSize",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "pageSize",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "pageSize",
+          "variableType" : "Integer",
+          "documentation" : "<p>The maximum number of items to return with this call.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "PageToken",
+        "c2jShape" : "PageToken",
+        "deprecated" : false,
+        "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPageToken",
+        "getterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@return The page token for the next set of results. To retrieve the first set of results, use null.*/",
+        "getterMethodName" : "getPageToken",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "PageToken",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "PageToken",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "PageToken",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.*/",
+        "setterMethodName" : "setPageToken",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pageToken",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "pageToken",
+          "variableType" : "String",
+          "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "AcceptLanguage",
+        "c2jShape" : "AcceptLanguage",
+        "deprecated" : false,
+        "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAcceptLanguage",
+        "getterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@return The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
+        "getterMethodName" : "getAcceptLanguage",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "AcceptLanguage",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "AcceptLanguage",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "AcceptLanguage",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
+        "setterMethodName" : "setAcceptLanguage",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "acceptLanguage",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "acceptLanguage",
+          "variableType" : "String",
+          "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "AcceptLanguage" : {
+          "c2jName" : "AcceptLanguage",
+          "c2jShape" : "AcceptLanguage",
+          "deprecated" : false,
+          "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAcceptLanguage",
+          "getterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@return The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
+          "getterMethodName" : "getAcceptLanguage",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "AcceptLanguage",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "AcceptLanguage",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "AcceptLanguage",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
+          "setterMethodName" : "setAcceptLanguage",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "acceptLanguage",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "acceptLanguage",
+            "variableType" : "String",
+            "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "PageSize" : {
+          "c2jName" : "PageSize",
+          "c2jShape" : "PageSize",
+          "deprecated" : false,
+          "documentation" : "<p>The maximum number of items to return with this call.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPageSize",
+          "getterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@return The maximum number of items to return with this call.*/",
+          "getterMethodName" : "getPageSize",
+          "getterModel" : {
+            "returnType" : "Integer",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "PageSize",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "PageSize",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "Integer",
+          "marshallingType" : "INTEGER",
+          "name" : "PageSize",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.*/",
+          "setterMethodName" : "setPageSize",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "pageSize",
+            "variableType" : "Integer",
+            "documentation" : "",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "Integer",
+            "variableName" : "pageSize",
+            "variableType" : "Integer",
+            "documentation" : "<p>The maximum number of items to return with this call.</p>",
+            "simpleType" : "Integer",
+            "variableSetterType" : "Integer"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "PageToken" : {
+          "c2jName" : "PageToken",
+          "c2jShape" : "PageToken",
+          "deprecated" : false,
+          "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withPageToken",
+          "getterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@return The page token for the next set of results. To retrieve the first set of results, use null.*/",
+          "getterMethodName" : "getPageToken",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "PageToken",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "PageToken",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "PageToken",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.*/",
+          "setterMethodName" : "setPageToken",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pageToken",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "pageToken",
+            "variableType" : "String",
+            "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "ProductId" : {
+          "c2jName" : "ProductId",
+          "c2jShape" : "Id",
           "deprecated" : false,
-          "documentation" : "<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>",
+          "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@param resourceType The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResourceType",
-          "getterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@return The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>*/",
-          "getterMethodName" : "getResourceType",
+          "fluentSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withProductId",
+          "getterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@return The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
+          "getterMethodName" : "getProductId",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -62001,11 +63238,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "ResourceType",
+            "marshallLocationName" : "ProductId",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "ResourceType",
+            "unmarshallLocationName" : "ProductId",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -62017,14 +63254,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "ResourceType",
+          "name" : "ProductId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@param resourceType The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>*/",
-          "setterMethodName" : "setResourceType",
+          "setterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
+          "setterMethodName" : "setProductId",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceType",
+            "variableName" : "productId",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -62033,28 +63270,28 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>\n@param resourceType The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "resourceType",
+            "variableName" : "productId",
             "variableType" : "String",
-            "documentation" : "<p>The resource type.</p> <ul> <li> <p> <code>Portfolio</code> </p> </li> <li> <p> <code>Product</code> </p> </li> </ul>",
+            "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "TagOptionId" : {
-          "c2jName" : "TagOptionId",
-          "c2jShape" : "TagOptionId",
+        "ProvisioningArtifactId" : {
+          "c2jName" : "ProvisioningArtifactId",
+          "c2jShape" : "Id",
           "deprecated" : false,
-          "documentation" : "<p>The TagOption identifier.</p>",
+          "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The TagOption identifier.</p>\n@param tagOptionId The TagOption identifier.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withTagOptionId",
-          "getterDocumentation" : "/**<p>The TagOption identifier.</p>\n@return The TagOption identifier.*/",
-          "getterMethodName" : "getTagOptionId",
+          "fluentSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withProvisioningArtifactId",
+          "getterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@return The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
+          "getterMethodName" : "getProvisioningArtifactId",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -62069,11 +63306,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "TagOptionId",
+            "marshallLocationName" : "ProvisioningArtifactId",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "TagOptionId",
+            "unmarshallLocationName" : "ProvisioningArtifactId",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -62085,14 +63322,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "TagOptionId",
+          "name" : "ProvisioningArtifactId",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The TagOption identifier.</p>\n@param tagOptionId The TagOption identifier.*/",
-          "setterMethodName" : "setTagOptionId",
+          "setterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
+          "setterMethodName" : "setProvisioningArtifactId",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "tagOptionId",
+            "variableName" : "provisioningArtifactId",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -62101,13 +63338,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The TagOption identifier.</p>\n@param tagOptionId The TagOption identifier.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "tagOptionId",
+            "variableName" : "provisioningArtifactId",
             "variableType" : "String",
-            "documentation" : "<p>The TagOption identifier.</p>",
+            "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
@@ -62116,24 +63353,24 @@
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "TagOptionId" ],
-      "shapeName" : "ListResourcesForTagOptionRequest",
+      "required" : [ "ProductId", "ProvisioningArtifactId" ],
+      "shapeName" : "ListServiceActionsForProvisioningArtifactRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListResourcesForTagOptionRequest",
-        "variableName" : "listResourcesForTagOptionRequest",
-        "variableType" : "ListResourcesForTagOptionRequest",
+        "variableDeclarationType" : "ListServiceActionsForProvisioningArtifactRequest",
+        "variableName" : "listServiceActionsForProvisioningArtifactRequest",
+        "variableType" : "ListServiceActionsForProvisioningArtifactRequest",
         "documentation" : null,
-        "simpleType" : "ListResourcesForTagOptionRequest",
-        "variableSetterType" : "ListResourcesForTagOptionRequest"
+        "simpleType" : "ListServiceActionsForProvisioningArtifactRequest",
+        "variableSetterType" : "ListServiceActionsForProvisioningArtifactRequest"
       },
       "wrapper" : false
     },
-    "ListResourcesForTagOptionResult" : {
-      "c2jName" : "ListResourcesForTagOptionOutput",
+    "ListServiceActionsForProvisioningArtifactResult" : {
+      "c2jName" : "ListServiceActionsForProvisioningArtifactOutput",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -62151,17 +63388,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ResourceDetails",
-        "c2jShape" : "ResourceDetails",
+        "c2jName" : "ServiceActionSummaries",
+        "c2jShape" : "ServiceActionSummaries",
         "deprecated" : false,
-        "documentation" : "<p>Information about the resources.</p>",
+        "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withResourceDetails",
-        "getterDocumentation" : "/**<p>Information about the resources.</p>\n@return Information about the resources.*/",
-        "getterMethodName" : "getResourceDetails",
+        "fluentSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withServiceActionSummaries",
+        "getterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@return An object containing information about the self-service actions associated with the provisioning artifact.*/",
+        "getterMethodName" : "getServiceActionSummaries",
         "getterModel" : {
-          "returnType" : "java.util.List<ResourceDetail>",
+          "returnType" : "java.util.List<ServiceActionSummary>",
           "documentation" : null
         },
         "http" : {
@@ -62174,11 +63411,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "ResourceDetails",
+          "marshallLocationName" : "ServiceActionSummaries",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "ResourceDetails",
+          "unmarshallLocationName" : "ServiceActionSummaries",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -62190,7 +63427,7 @@
           "interfaceType" : "java.util.List",
           "listMemberModel" : {
             "c2jName" : "member",
-            "c2jShape" : "ResourceDetail",
+            "c2jShape" : "ServiceActionSummary",
             "deprecated" : false,
             "documentation" : "",
             "enumType" : null,
@@ -62199,7 +63436,7 @@
             "getterDocumentation" : "/**\n@return */",
             "getterMethodName" : "getMember",
             "getterModel" : {
-              "returnType" : "ResourceDetail",
+              "returnType" : "ServiceActionSummary",
               "documentation" : null
             },
             "http" : {
@@ -62234,12 +63471,12 @@
             "setterMethodName" : "setMember",
             "setterModel" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "ResourceDetail",
+              "variableDeclarationType" : "ServiceActionSummary",
               "variableName" : "member",
-              "variableType" : "ResourceDetail",
+              "variableType" : "ServiceActionSummary",
               "documentation" : "",
-              "simpleType" : "ResourceDetail",
-              "variableSetterType" : "ResourceDetail"
+              "simpleType" : "ServiceActionSummary",
+              "variableSetterType" : "ServiceActionSummary"
             },
             "shouldEmitLegacyEnumSetter" : false,
             "simple" : false,
@@ -62247,68 +63484,68 @@
             "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "ResourceDetail",
+              "variableDeclarationType" : "ServiceActionSummary",
               "variableName" : "member",
-              "variableType" : "ResourceDetail",
+              "variableType" : "ServiceActionSummary",
               "documentation" : "",
-              "simpleType" : "ResourceDetail",
-              "variableSetterType" : "ResourceDetail"
+              "simpleType" : "ServiceActionSummary",
+              "variableSetterType" : "ServiceActionSummary"
             },
             "xmlNameSpaceUri" : null
           },
           "memberLocationName" : null,
-          "memberType" : "ResourceDetail",
+          "memberType" : "ServiceActionSummary",
           "map" : false,
           "marshallNonAutoConstructedEmptyLists" : false,
           "memberAdditionalMarshallingPath" : null,
           "memberAdditionalUnmarshallingPath" : null,
           "sendEmptyQueryString" : false,
           "simple" : false,
-          "simpleType" : "ResourceDetail",
-          "templateImplType" : "java.util.ArrayList<ResourceDetail>",
-          "templateType" : "java.util.List<ResourceDetail>"
+          "simpleType" : "ServiceActionSummary",
+          "templateImplType" : "java.util.ArrayList<ServiceActionSummary>",
+          "templateType" : "java.util.List<ServiceActionSummary>"
         },
         "map" : false,
         "mapModel" : null,
         "marshallingTargetClass" : "List",
         "marshallingType" : "LIST",
-        "name" : "ResourceDetails",
+        "name" : "ServiceActionSummaries",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.*/",
-        "setterMethodName" : "setResourceDetails",
+        "setterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.*/",
+        "setterMethodName" : "setServiceActionSummaries",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ResourceDetail>",
-          "variableName" : "resourceDetails",
-          "variableType" : "java.util.List<ResourceDetail>",
+          "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
+          "variableName" : "serviceActionSummaries",
+          "variableType" : "java.util.List<ServiceActionSummary>",
           "documentation" : "",
-          "simpleType" : "List<ResourceDetail>",
-          "variableSetterType" : "java.util.Collection<ResourceDetail>"
+          "simpleType" : "List<ServiceActionSummary>",
+          "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>Information about the resources.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setResourceDetails(java.util.Collection)} or {@link #withResourceDetails(java.util.Collection)} if you want to override the existing values.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ResourceDetail>",
-          "variableName" : "resourceDetails",
-          "variableType" : "java.util.List<ResourceDetail>",
-          "documentation" : "<p>Information about the resources.</p>",
-          "simpleType" : "List<ResourceDetail>",
-          "variableSetterType" : "java.util.Collection<ResourceDetail>"
+          "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
+          "variableName" : "serviceActionSummaries",
+          "variableType" : "java.util.List<ServiceActionSummary>",
+          "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
+          "simpleType" : "List<ServiceActionSummary>",
+          "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "PageToken",
+        "c2jName" : "NextPageToken",
         "c2jShape" : "PageToken",
         "deprecated" : false,
-        "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+        "documentation" : "<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withPageToken",
-        "getterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@return The page token for the next set of results. To retrieve the first set of results, use null.*/",
-        "getterMethodName" : "getPageToken",
+        "fluentSetterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@param nextPageToken The page token to use to retrieve the next set of results. If there are no additional results, this value is null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withNextPageToken",
+        "getterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@return The page token to use to retrieve the next set of results. If there are no additional results, this value is null.*/",
+        "getterMethodName" : "getNextPageToken",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -62323,11 +63560,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "PageToken",
+          "marshallLocationName" : "NextPageToken",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "PageToken",
+          "unmarshallLocationName" : "NextPageToken",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -62339,14 +63576,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "PageToken",
+        "name" : "NextPageToken",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.*/",
-        "setterMethodName" : "setPageToken",
+        "setterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@param nextPageToken The page token to use to retrieve the next set of results. If there are no additional results, this value is null.*/",
+        "setterMethodName" : "setNextPageToken",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "pageToken",
+          "variableName" : "nextPageToken",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -62355,29 +63592,29 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@param nextPageToken The page token to use to retrieve the next set of results. If there are no additional results, this value is null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "pageToken",
+          "variableName" : "nextPageToken",
           "variableType" : "String",
-          "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+          "documentation" : "<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
-        "PageToken" : {
-          "c2jName" : "PageToken",
+        "NextPageToken" : {
+          "c2jName" : "NextPageToken",
           "c2jShape" : "PageToken",
           "deprecated" : false,
-          "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+          "documentation" : "<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withPageToken",
-          "getterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@return The page token for the next set of results. To retrieve the first set of results, use null.*/",
-          "getterMethodName" : "getPageToken",
+          "fluentSetterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@param nextPageToken The page token to use to retrieve the next set of results. If there are no additional results, this value is null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withNextPageToken",
+          "getterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@return The page token to use to retrieve the next set of results. If there are no additional results, this value is null.*/",
+          "getterMethodName" : "getNextPageToken",
           "getterModel" : {
             "returnType" : "String",
             "documentation" : null
@@ -62392,11 +63629,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "PageToken",
+            "marshallLocationName" : "NextPageToken",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "PageToken",
+            "unmarshallLocationName" : "NextPageToken",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -62408,14 +63645,14 @@
           "mapModel" : null,
           "marshallingTargetClass" : "String",
           "marshallingType" : "STRING",
-          "name" : "PageToken",
+          "name" : "NextPageToken",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.*/",
-          "setterMethodName" : "setPageToken",
+          "setterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@param nextPageToken The page token to use to retrieve the next set of results. If there are no additional results, this value is null.*/",
+          "setterMethodName" : "setNextPageToken",
           "setterModel" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pageToken",
+            "variableName" : "nextPageToken",
             "variableType" : "String",
             "documentation" : "",
             "simpleType" : "String",
@@ -62424,30 +63661,30 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : true,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>\n@param pageToken The page token for the next set of results. To retrieve the first set of results, use null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>\n@param nextPageToken The page token to use to retrieve the next set of results. If there are no additional results, this value is null.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "String",
-            "variableName" : "pageToken",
+            "variableName" : "nextPageToken",
             "variableType" : "String",
-            "documentation" : "<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>",
+            "documentation" : "<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>",
             "simpleType" : "String",
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
         },
-        "ResourceDetails" : {
-          "c2jName" : "ResourceDetails",
-          "c2jShape" : "ResourceDetails",
+        "ServiceActionSummaries" : {
+          "c2jName" : "ServiceActionSummaries",
+          "c2jShape" : "ServiceActionSummaries",
           "deprecated" : false,
-          "documentation" : "<p>Information about the resources.</p>",
+          "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withResourceDetails",
-          "getterDocumentation" : "/**<p>Information about the resources.</p>\n@return Information about the resources.*/",
-          "getterMethodName" : "getResourceDetails",
+          "fluentSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withServiceActionSummaries",
+          "getterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@return An object containing information about the self-service actions associated with the provisioning artifact.*/",
+          "getterMethodName" : "getServiceActionSummaries",
           "getterModel" : {
-            "returnType" : "java.util.List<ResourceDetail>",
+            "returnType" : "java.util.List<ServiceActionSummary>",
             "documentation" : null
           },
           "http" : {
@@ -62460,11 +63697,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "ResourceDetails",
+            "marshallLocationName" : "ServiceActionSummaries",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "ResourceDetails",
+            "unmarshallLocationName" : "ServiceActionSummaries",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -62476,7 +63713,7 @@
             "interfaceType" : "java.util.List",
             "listMemberModel" : {
               "c2jName" : "member",
-              "c2jShape" : "ResourceDetail",
+              "c2jShape" : "ServiceActionSummary",
               "deprecated" : false,
               "documentation" : "",
               "enumType" : null,
@@ -62485,7 +63722,7 @@
               "getterDocumentation" : "/**\n@return */",
               "getterMethodName" : "getMember",
               "getterModel" : {
-                "returnType" : "ResourceDetail",
+                "returnType" : "ServiceActionSummary",
                 "documentation" : null
               },
               "http" : {
@@ -62520,12 +63757,12 @@
               "setterMethodName" : "setMember",
               "setterModel" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "ResourceDetail",
+                "variableDeclarationType" : "ServiceActionSummary",
                 "variableName" : "member",
-                "variableType" : "ResourceDetail",
+                "variableType" : "ServiceActionSummary",
                 "documentation" : "",
-                "simpleType" : "ResourceDetail",
-                "variableSetterType" : "ResourceDetail"
+                "simpleType" : "ServiceActionSummary",
+                "variableSetterType" : "ServiceActionSummary"
               },
               "shouldEmitLegacyEnumSetter" : false,
               "simple" : false,
@@ -62533,56 +63770,56 @@
               "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
               "variable" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "ResourceDetail",
+                "variableDeclarationType" : "ServiceActionSummary",
                 "variableName" : "member",
-                "variableType" : "ResourceDetail",
+                "variableType" : "ServiceActionSummary",
                 "documentation" : "",
-                "simpleType" : "ResourceDetail",
-                "variableSetterType" : "ResourceDetail"
+                "simpleType" : "ServiceActionSummary",
+                "variableSetterType" : "ServiceActionSummary"
               },
               "xmlNameSpaceUri" : null
             },
             "memberLocationName" : null,
-            "memberType" : "ResourceDetail",
+            "memberType" : "ServiceActionSummary",
             "map" : false,
             "marshallNonAutoConstructedEmptyLists" : false,
             "memberAdditionalMarshallingPath" : null,
             "memberAdditionalUnmarshallingPath" : null,
             "sendEmptyQueryString" : false,
             "simple" : false,
-            "simpleType" : "ResourceDetail",
-            "templateImplType" : "java.util.ArrayList<ResourceDetail>",
-            "templateType" : "java.util.List<ResourceDetail>"
+            "simpleType" : "ServiceActionSummary",
+            "templateImplType" : "java.util.ArrayList<ServiceActionSummary>",
+            "templateType" : "java.util.List<ServiceActionSummary>"
           },
           "map" : false,
           "mapModel" : null,
           "marshallingTargetClass" : "List",
           "marshallingType" : "LIST",
-          "name" : "ResourceDetails",
+          "name" : "ServiceActionSummaries",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>Information about the resources.</p>\n@param resourceDetails Information about the resources.*/",
-          "setterMethodName" : "setResourceDetails",
+          "setterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.*/",
+          "setterMethodName" : "setServiceActionSummaries",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ResourceDetail>",
-            "variableName" : "resourceDetails",
-            "variableType" : "java.util.List<ResourceDetail>",
+            "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
+            "variableName" : "serviceActionSummaries",
+            "variableType" : "java.util.List<ServiceActionSummary>",
             "documentation" : "",
-            "simpleType" : "List<ResourceDetail>",
-            "variableSetterType" : "java.util.Collection<ResourceDetail>"
+            "simpleType" : "List<ServiceActionSummary>",
+            "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>Information about the resources.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setResourceDetails(java.util.Collection)} or {@link #withResourceDetails(java.util.Collection)} if you want to override the existing values.</p>\n@param resourceDetails Information about the resources.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ResourceDetail>",
-            "variableName" : "resourceDetails",
-            "variableType" : "java.util.List<ResourceDetail>",
-            "documentation" : "<p>Information about the resources.</p>",
-            "simpleType" : "List<ResourceDetail>",
-            "variableSetterType" : "java.util.Collection<ResourceDetail>"
+            "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
+            "variableName" : "serviceActionSummaries",
+            "variableType" : "java.util.List<ServiceActionSummary>",
+            "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
+            "simpleType" : "List<ServiceActionSummary>",
+            "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -62590,7 +63827,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListResourcesForTagOptionResult",
+      "shapeName" : "ListServiceActionsForProvisioningArtifactResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -62599,17 +63836,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListResourcesForTagOptionResult",
-        "variableName" : "listResourcesForTagOptionResult",
-        "variableType" : "ListResourcesForTagOptionResult",
+        "variableDeclarationType" : "ListServiceActionsForProvisioningArtifactResult",
+        "variableName" : "listServiceActionsForProvisioningArtifactResult",
+        "variableType" : "ListServiceActionsForProvisioningArtifactResult",
         "documentation" : null,
-        "simpleType" : "ListResourcesForTagOptionResult",
-        "variableSetterType" : "ListResourcesForTagOptionResult"
+        "simpleType" : "ListServiceActionsForProvisioningArtifactResult",
+        "variableSetterType" : "ListServiceActionsForProvisioningArtifactResult"
       },
       "wrapper" : false
     },
-    "ListServiceActionsForProvisioningArtifactRequest" : {
-      "c2jName" : "ListServiceActionsForProvisioningArtifactInput",
+    "ListServiceActionsRequest" : {
+      "c2jName" : "ListServiceActionsInput",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -62626,90 +63863,23 @@
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : {
-        "action" : "ListServiceActionsForProvisioningArtifact",
+        "action" : "ListServiceActions",
         "locationName" : null,
         "requestUri" : "/",
-        "target" : "AWS242ServiceCatalogService.ListServiceActionsForProvisioningArtifact",
+        "target" : "AWS242ServiceCatalogService.ListServiceActions",
         "verb" : "POST",
         "xmlNameSpaceUri" : null
       },
       "members" : [ {
-        "c2jName" : "ProductId",
-        "c2jShape" : "Id",
-        "deprecated" : false,
-        "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withProductId",
-        "getterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@return The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
-        "getterMethodName" : "getProductId",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "ProductId",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "ProductId",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "ProductId",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
-        "setterMethodName" : "setProductId",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "productId",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "productId",
-          "variableType" : "String",
-          "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "ProvisioningArtifactId",
-        "c2jShape" : "Id",
+        "c2jName" : "AcceptLanguage",
+        "c2jShape" : "AcceptLanguage",
         "deprecated" : false,
-        "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
+        "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withProvisioningArtifactId",
-        "getterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@return The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
-        "getterMethodName" : "getProvisioningArtifactId",
+        "fluentSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAcceptLanguage",
+        "getterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@return The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
+        "getterMethodName" : "getAcceptLanguage",
         "getterModel" : {
           "returnType" : "String",
           "documentation" : null
@@ -62724,11 +63894,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "ProvisioningArtifactId",
+          "marshallLocationName" : "AcceptLanguage",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "ProvisioningArtifactId",
+          "unmarshallLocationName" : "AcceptLanguage",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -62740,14 +63910,14 @@
         "mapModel" : null,
         "marshallingTargetClass" : "String",
         "marshallingType" : "STRING",
-        "name" : "ProvisioningArtifactId",
+        "name" : "AcceptLanguage",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
-        "setterMethodName" : "setProvisioningArtifactId",
+        "setterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
+        "setterMethodName" : "setAcceptLanguage",
         "setterModel" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "provisioningArtifactId",
+          "variableName" : "acceptLanguage",
           "variableType" : "String",
           "documentation" : "",
           "simpleType" : "String",
@@ -62756,13 +63926,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "String",
-          "variableName" : "provisioningArtifactId",
+          "variableName" : "acceptLanguage",
           "variableType" : "String",
-          "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
+          "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
           "simpleType" : "String",
           "variableSetterType" : "String"
         },
@@ -62901,73 +64071,6 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
-      }, {
-        "c2jName" : "AcceptLanguage",
-        "c2jShape" : "AcceptLanguage",
-        "deprecated" : false,
-        "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
-        "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withAcceptLanguage",
-        "getterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@return The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
-        "getterMethodName" : "getAcceptLanguage",
-        "getterModel" : {
-          "returnType" : "String",
-          "documentation" : null
-        },
-        "http" : {
-          "additionalMarshallingPath" : null,
-          "additionalUnmarshallingPath" : null,
-          "flattened" : false,
-          "greedy" : false,
-          "header" : false,
-          "isPayload" : false,
-          "isStreaming" : false,
-          "location" : null,
-          "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "AcceptLanguage",
-          "queryString" : false,
-          "requiresLength" : false,
-          "statusCode" : false,
-          "unmarshallLocationName" : "AcceptLanguage",
-          "uri" : false
-        },
-        "idempotencyToken" : false,
-        "isBinary" : false,
-        "jsonValue" : false,
-        "list" : false,
-        "listModel" : null,
-        "map" : false,
-        "mapModel" : null,
-        "marshallingTargetClass" : "String",
-        "marshallingType" : "STRING",
-        "name" : "AcceptLanguage",
-        "sensitive" : false,
-        "setterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>*/",
-        "setterMethodName" : "setAcceptLanguage",
-        "setterModel" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "acceptLanguage",
-          "variableType" : "String",
-          "documentation" : "",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "shouldEmitLegacyEnumSetter" : false,
-        "simple" : true,
-        "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>\n@param acceptLanguage The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "variable" : {
-          "timestampFormat" : null,
-          "variableDeclarationType" : "String",
-          "variableName" : "acceptLanguage",
-          "variableType" : "String",
-          "documentation" : "<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>",
-          "simpleType" : "String",
-          "variableSetterType" : "String"
-        },
-        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
         "AcceptLanguage" : {
@@ -63173,164 +64276,28 @@
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
-        },
-        "ProductId" : {
-          "c2jName" : "ProductId",
-          "c2jShape" : "Id",
-          "deprecated" : false,
-          "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withProductId",
-          "getterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@return The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
-          "getterMethodName" : "getProductId",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "ProductId",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "ProductId",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "ProductId",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.*/",
-          "setterMethodName" : "setProductId",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "productId",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>\n@param productId The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "productId",
-            "variableType" : "String",
-            "documentation" : "<p>The product identifier. For example, <code>prod-abcdzk7xy33qa</code>.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
-        },
-        "ProvisioningArtifactId" : {
-          "c2jName" : "ProvisioningArtifactId",
-          "c2jShape" : "Id",
-          "deprecated" : false,
-          "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
-          "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withProvisioningArtifactId",
-          "getterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@return The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
-          "getterMethodName" : "getProvisioningArtifactId",
-          "getterModel" : {
-            "returnType" : "String",
-            "documentation" : null
-          },
-          "http" : {
-            "additionalMarshallingPath" : null,
-            "additionalUnmarshallingPath" : null,
-            "flattened" : false,
-            "greedy" : false,
-            "header" : false,
-            "isPayload" : false,
-            "isStreaming" : false,
-            "location" : null,
-            "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "ProvisioningArtifactId",
-            "queryString" : false,
-            "requiresLength" : false,
-            "statusCode" : false,
-            "unmarshallLocationName" : "ProvisioningArtifactId",
-            "uri" : false
-          },
-          "idempotencyToken" : false,
-          "isBinary" : false,
-          "jsonValue" : false,
-          "list" : false,
-          "listModel" : null,
-          "map" : false,
-          "mapModel" : null,
-          "marshallingTargetClass" : "String",
-          "marshallingType" : "STRING",
-          "name" : "ProvisioningArtifactId",
-          "sensitive" : false,
-          "setterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.*/",
-          "setterMethodName" : "setProvisioningArtifactId",
-          "setterModel" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "provisioningArtifactId",
-            "variableType" : "String",
-            "documentation" : "",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "shouldEmitLegacyEnumSetter" : false,
-          "simple" : true,
-          "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>\n@param provisioningArtifactId The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "variable" : {
-            "timestampFormat" : null,
-            "variableDeclarationType" : "String",
-            "variableName" : "provisioningArtifactId",
-            "variableType" : "String",
-            "documentation" : "<p>The identifier of the provisioning artifact. For example, <code>pa-4abcdjnxjj6ne</code>.</p>",
-            "simpleType" : "String",
-            "variableSetterType" : "String"
-          },
-          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : [ "ProductId", "ProvisioningArtifactId" ],
-      "shapeName" : "ListServiceActionsForProvisioningArtifactRequest",
+      "required" : null,
+      "shapeName" : "ListServiceActionsRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListServiceActionsForProvisioningArtifactRequest",
-        "variableName" : "listServiceActionsForProvisioningArtifactRequest",
-        "variableType" : "ListServiceActionsForProvisioningArtifactRequest",
+        "variableDeclarationType" : "ListServiceActionsRequest",
+        "variableName" : "listServiceActionsRequest",
+        "variableType" : "ListServiceActionsRequest",
         "documentation" : null,
-        "simpleType" : "ListServiceActionsForProvisioningArtifactRequest",
-        "variableSetterType" : "ListServiceActionsForProvisioningArtifactRequest"
+        "simpleType" : "ListServiceActionsRequest",
+        "variableSetterType" : "ListServiceActionsRequest"
       },
       "wrapper" : false
     },
-    "ListServiceActionsForProvisioningArtifactResult" : {
-      "c2jName" : "ListServiceActionsForProvisioningArtifactOutput",
+    "ListServiceActionsResult" : {
+      "c2jName" : "ListServiceActionsOutput",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -63351,11 +64318,11 @@
         "c2jName" : "ServiceActionSummaries",
         "c2jShape" : "ServiceActionSummaries",
         "deprecated" : false,
-        "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
+        "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "fluentSetterMethodName" : "withServiceActionSummaries",
-        "getterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@return An object containing information about the self-service actions associated with the provisioning artifact.*/",
+        "getterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@return An object containing information about the service actions associated with the provisioning artifact.*/",
         "getterMethodName" : "getServiceActionSummaries",
         "getterModel" : {
           "returnType" : "java.util.List<ServiceActionSummary>",
@@ -63471,7 +64438,7 @@
         "marshallingType" : "LIST",
         "name" : "ServiceActionSummaries",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.*/",
+        "setterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.*/",
         "setterMethodName" : "setServiceActionSummaries",
         "setterModel" : {
           "timestampFormat" : null,
@@ -63485,13 +64452,13 @@
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
           "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
           "variableName" : "serviceActionSummaries",
           "variableType" : "java.util.List<ServiceActionSummary>",
-          "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
+          "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
           "simpleType" : "List<ServiceActionSummary>",
           "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
         },
@@ -63637,11 +64604,11 @@
           "c2jName" : "ServiceActionSummaries",
           "c2jShape" : "ServiceActionSummaries",
           "deprecated" : false,
-          "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
+          "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "fluentSetterMethodName" : "withServiceActionSummaries",
-          "getterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@return An object containing information about the self-service actions associated with the provisioning artifact.*/",
+          "getterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@return An object containing information about the service actions associated with the provisioning artifact.*/",
           "getterMethodName" : "getServiceActionSummaries",
           "getterModel" : {
             "returnType" : "java.util.List<ServiceActionSummary>",
@@ -63757,7 +64724,7 @@
           "marshallingType" : "LIST",
           "name" : "ServiceActionSummaries",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.*/",
+          "setterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.*/",
           "setterMethodName" : "setServiceActionSummaries",
           "setterModel" : {
             "timestampFormat" : null,
@@ -63771,13 +64738,13 @@
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the self-service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
             "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
             "variableName" : "serviceActionSummaries",
             "variableType" : "java.util.List<ServiceActionSummary>",
-            "documentation" : "<p>An object containing information about the self-service actions associated with the provisioning artifact.</p>",
+            "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
             "simpleType" : "List<ServiceActionSummary>",
             "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
           },
@@ -63787,7 +64754,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListServiceActionsForProvisioningArtifactResult",
+      "shapeName" : "ListServiceActionsResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -63796,17 +64763,17 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListServiceActionsForProvisioningArtifactResult",
-        "variableName" : "listServiceActionsForProvisioningArtifactResult",
-        "variableType" : "ListServiceActionsForProvisioningArtifactResult",
+        "variableDeclarationType" : "ListServiceActionsResult",
+        "variableName" : "listServiceActionsResult",
+        "variableType" : "ListServiceActionsResult",
         "documentation" : null,
-        "simpleType" : "ListServiceActionsForProvisioningArtifactResult",
-        "variableSetterType" : "ListServiceActionsForProvisioningArtifactResult"
+        "simpleType" : "ListServiceActionsResult",
+        "variableSetterType" : "ListServiceActionsResult"
       },
       "wrapper" : false
     },
-    "ListServiceActionsRequest" : {
-      "c2jName" : "ListServiceActionsInput",
+    "ListStackInstancesForProvisionedProductRequest" : {
+      "c2jName" : "ListStackInstancesForProvisionedProductInput",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -63823,10 +64790,10 @@
       "hasStatusCodeMember" : false,
       "hasStreamingMember" : false,
       "marshaller" : {
-        "action" : "ListServiceActions",
+        "action" : "ListStackInstancesForProvisionedProduct",
         "locationName" : null,
         "requestUri" : "/",
-        "target" : "AWS242ServiceCatalogService.ListServiceActions",
+        "target" : "AWS242ServiceCatalogService.ListStackInstancesForProvisionedProduct",
         "verb" : "POST",
         "xmlNameSpaceUri" : null
       },
@@ -63898,17 +64865,17 @@
         },
         "xmlNameSpaceUri" : null
       }, {
-        "c2jName" : "PageSize",
-        "c2jShape" : "PageSize",
+        "c2jName" : "ProvisionedProductId",
+        "c2jShape" : "Id",
         "deprecated" : false,
-        "documentation" : "<p>The maximum number of items to return with this call.</p>",
+        "documentation" : "<p>The identifier of the provisioned product.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withPageSize",
-        "getterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@return The maximum number of items to return with this call.*/",
-        "getterMethodName" : "getPageSize",
+        "fluentSetterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@param provisionedProductId The identifier of the provisioned product.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withProvisionedProductId",
+        "getterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@return The identifier of the provisioned product.*/",
+        "getterMethodName" : "getProvisionedProductId",
         "getterModel" : {
-          "returnType" : "Integer",
+          "returnType" : "String",
           "documentation" : null
         },
         "http" : {
@@ -63921,11 +64888,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "PageSize",
+          "marshallLocationName" : "ProvisionedProductId",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "PageSize",
+          "unmarshallLocationName" : "ProvisionedProductId",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -63935,33 +64902,33 @@
         "listModel" : null,
         "map" : false,
         "mapModel" : null,
-        "marshallingTargetClass" : "Integer",
-        "marshallingType" : "INTEGER",
-        "name" : "PageSize",
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "ProvisionedProductId",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.*/",
-        "setterMethodName" : "setPageSize",
+        "setterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@param provisionedProductId The identifier of the provisioned product.*/",
+        "setterMethodName" : "setProvisionedProductId",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "pageSize",
-          "variableType" : "Integer",
+          "variableDeclarationType" : "String",
+          "variableName" : "provisionedProductId",
+          "variableType" : "String",
           "documentation" : "",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : true,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@param provisionedProductId The identifier of the provisioned product.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "Integer",
-          "variableName" : "pageSize",
-          "variableType" : "Integer",
-          "documentation" : "<p>The maximum number of items to return with this call.</p>",
-          "simpleType" : "Integer",
-          "variableSetterType" : "Integer"
+          "variableDeclarationType" : "String",
+          "variableName" : "provisionedProductId",
+          "variableType" : "String",
+          "documentation" : "<p>The identifier of the provisioned product.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
       }, {
@@ -64031,6 +64998,73 @@
           "variableSetterType" : "String"
         },
         "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "PageSize",
+        "c2jShape" : "PageSize",
+        "deprecated" : false,
+        "documentation" : "<p>The maximum number of items to return with this call.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withPageSize",
+        "getterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@return The maximum number of items to return with this call.*/",
+        "getterMethodName" : "getPageSize",
+        "getterModel" : {
+          "returnType" : "Integer",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "PageSize",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "PageSize",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "Integer",
+        "marshallingType" : "INTEGER",
+        "name" : "PageSize",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.*/",
+        "setterMethodName" : "setPageSize",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "pageSize",
+          "variableType" : "Integer",
+          "documentation" : "",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The maximum number of items to return with this call.</p>\n@param pageSize The maximum number of items to return with this call.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "Integer",
+          "variableName" : "pageSize",
+          "variableType" : "Integer",
+          "documentation" : "<p>The maximum number of items to return with this call.</p>",
+          "simpleType" : "Integer",
+          "variableSetterType" : "Integer"
+        },
+        "xmlNameSpaceUri" : null
       } ],
       "membersAsMap" : {
         "AcceptLanguage" : {
@@ -64236,28 +65270,96 @@
             "variableSetterType" : "String"
           },
           "xmlNameSpaceUri" : null
+        },
+        "ProvisionedProductId" : {
+          "c2jName" : "ProvisionedProductId",
+          "c2jShape" : "Id",
+          "deprecated" : false,
+          "documentation" : "<p>The identifier of the provisioned product.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@param provisionedProductId The identifier of the provisioned product.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withProvisionedProductId",
+          "getterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@return The identifier of the provisioned product.*/",
+          "getterMethodName" : "getProvisionedProductId",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "ProvisionedProductId",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "ProvisionedProductId",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "ProvisionedProductId",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@param provisionedProductId The identifier of the provisioned product.*/",
+          "setterMethodName" : "setProvisionedProductId",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "provisionedProductId",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The identifier of the provisioned product.</p>\n@param provisionedProductId The identifier of the provisioned product.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "provisionedProductId",
+            "variableType" : "String",
+            "documentation" : "<p>The identifier of the provisioned product.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
         }
       },
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
-      "required" : null,
-      "shapeName" : "ListServiceActionsRequest",
+      "required" : [ "ProvisionedProductId" ],
+      "shapeName" : "ListStackInstancesForProvisionedProductRequest",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : null,
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListServiceActionsRequest",
-        "variableName" : "listServiceActionsRequest",
-        "variableType" : "ListServiceActionsRequest",
+        "variableDeclarationType" : "ListStackInstancesForProvisionedProductRequest",
+        "variableName" : "listStackInstancesForProvisionedProductRequest",
+        "variableType" : "ListStackInstancesForProvisionedProductRequest",
         "documentation" : null,
-        "simpleType" : "ListServiceActionsRequest",
-        "variableSetterType" : "ListServiceActionsRequest"
+        "simpleType" : "ListStackInstancesForProvisionedProductRequest",
+        "variableSetterType" : "ListStackInstancesForProvisionedProductRequest"
       },
       "wrapper" : false
     },
-    "ListServiceActionsResult" : {
-      "c2jName" : "ListServiceActionsOutput",
+    "ListStackInstancesForProvisionedProductResult" : {
+      "c2jName" : "ListStackInstancesForProvisionedProductOutput",
       "customization" : {
         "artificialResultWrapper" : null,
         "skipGeneratingMarshaller" : false,
@@ -64275,17 +65377,17 @@
       "hasStreamingMember" : false,
       "marshaller" : null,
       "members" : [ {
-        "c2jName" : "ServiceActionSummaries",
-        "c2jShape" : "ServiceActionSummaries",
+        "c2jName" : "StackInstances",
+        "c2jShape" : "StackInstances",
         "deprecated" : false,
-        "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
+        "documentation" : "<p>List of stack instances.</p>",
         "enumType" : null,
-        "fluentSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-        "fluentSetterMethodName" : "withServiceActionSummaries",
-        "getterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@return An object containing information about the service actions associated with the provisioning artifact.*/",
-        "getterMethodName" : "getServiceActionSummaries",
+        "fluentSetterDocumentation" : "/**<p>List of stack instances.</p>\n@param stackInstances List of stack instances.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withStackInstances",
+        "getterDocumentation" : "/**<p>List of stack instances.</p>\n@return List of stack instances.*/",
+        "getterMethodName" : "getStackInstances",
         "getterModel" : {
-          "returnType" : "java.util.List<ServiceActionSummary>",
+          "returnType" : "java.util.List<StackInstance>",
           "documentation" : null
         },
         "http" : {
@@ -64298,11 +65400,11 @@
           "isStreaming" : false,
           "location" : null,
           "marshallLocation" : "PAYLOAD",
-          "marshallLocationName" : "ServiceActionSummaries",
+          "marshallLocationName" : "StackInstances",
           "queryString" : false,
           "requiresLength" : false,
           "statusCode" : false,
-          "unmarshallLocationName" : "ServiceActionSummaries",
+          "unmarshallLocationName" : "StackInstances",
           "uri" : false
         },
         "idempotencyToken" : false,
@@ -64314,7 +65416,7 @@
           "interfaceType" : "java.util.List",
           "listMemberModel" : {
             "c2jName" : "member",
-            "c2jShape" : "ServiceActionSummary",
+            "c2jShape" : "StackInstance",
             "deprecated" : false,
             "documentation" : "",
             "enumType" : null,
@@ -64323,7 +65425,7 @@
             "getterDocumentation" : "/**\n@return */",
             "getterMethodName" : "getMember",
             "getterModel" : {
-              "returnType" : "ServiceActionSummary",
+              "returnType" : "StackInstance",
               "documentation" : null
             },
             "http" : {
@@ -64358,12 +65460,12 @@
             "setterMethodName" : "setMember",
             "setterModel" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "ServiceActionSummary",
+              "variableDeclarationType" : "StackInstance",
               "variableName" : "member",
-              "variableType" : "ServiceActionSummary",
+              "variableType" : "StackInstance",
               "documentation" : "",
-              "simpleType" : "ServiceActionSummary",
-              "variableSetterType" : "ServiceActionSummary"
+              "simpleType" : "StackInstance",
+              "variableSetterType" : "StackInstance"
             },
             "shouldEmitLegacyEnumSetter" : false,
             "simple" : false,
@@ -64371,56 +65473,56 @@
             "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
             "variable" : {
               "timestampFormat" : null,
-              "variableDeclarationType" : "ServiceActionSummary",
+              "variableDeclarationType" : "StackInstance",
               "variableName" : "member",
-              "variableType" : "ServiceActionSummary",
+              "variableType" : "StackInstance",
               "documentation" : "",
-              "simpleType" : "ServiceActionSummary",
-              "variableSetterType" : "ServiceActionSummary"
+              "simpleType" : "StackInstance",
+              "variableSetterType" : "StackInstance"
             },
             "xmlNameSpaceUri" : null
           },
           "memberLocationName" : null,
-          "memberType" : "ServiceActionSummary",
+          "memberType" : "StackInstance",
           "map" : false,
           "marshallNonAutoConstructedEmptyLists" : false,
           "memberAdditionalMarshallingPath" : null,
           "memberAdditionalUnmarshallingPath" : null,
           "sendEmptyQueryString" : false,
           "simple" : false,
-          "simpleType" : "ServiceActionSummary",
-          "templateImplType" : "java.util.ArrayList<ServiceActionSummary>",
-          "templateType" : "java.util.List<ServiceActionSummary>"
+          "simpleType" : "StackInstance",
+          "templateImplType" : "java.util.ArrayList<StackInstance>",
+          "templateType" : "java.util.List<StackInstance>"
         },
         "map" : false,
         "mapModel" : null,
         "marshallingTargetClass" : "List",
         "marshallingType" : "LIST",
-        "name" : "ServiceActionSummaries",
+        "name" : "StackInstances",
         "sensitive" : false,
-        "setterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.*/",
-        "setterMethodName" : "setServiceActionSummaries",
+        "setterDocumentation" : "/**<p>List of stack instances.</p>\n@param stackInstances List of stack instances.*/",
+        "setterMethodName" : "setStackInstances",
         "setterModel" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
-          "variableName" : "serviceActionSummaries",
-          "variableType" : "java.util.List<ServiceActionSummary>",
+          "variableDeclarationType" : "java.util.List<StackInstance>",
+          "variableName" : "stackInstances",
+          "variableType" : "java.util.List<StackInstance>",
           "documentation" : "",
-          "simpleType" : "List<ServiceActionSummary>",
-          "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
+          "simpleType" : "List<StackInstance>",
+          "variableSetterType" : "java.util.Collection<StackInstance>"
         },
         "shouldEmitLegacyEnumSetter" : false,
         "simple" : false,
         "unmarshallingType" : null,
-        "varargSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "varargSetterDocumentation" : "/**<p>List of stack instances.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setStackInstances(java.util.Collection)} or {@link #withStackInstances(java.util.Collection)} if you want to override the existing values.</p>\n@param stackInstances List of stack instances.\n@return Returns a reference to this object so that method calls can be chained together.*/",
         "variable" : {
           "timestampFormat" : null,
-          "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
-          "variableName" : "serviceActionSummaries",
-          "variableType" : "java.util.List<ServiceActionSummary>",
-          "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
-          "simpleType" : "List<ServiceActionSummary>",
-          "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
+          "variableDeclarationType" : "java.util.List<StackInstance>",
+          "variableName" : "stackInstances",
+          "variableType" : "java.util.List<StackInstance>",
+          "documentation" : "<p>List of stack instances.</p>",
+          "simpleType" : "List<StackInstance>",
+          "variableSetterType" : "java.util.Collection<StackInstance>"
         },
         "xmlNameSpaceUri" : null
       }, {
@@ -64560,18 +65662,18 @@
           },
           "xmlNameSpaceUri" : null
         },
-        "ServiceActionSummaries" : {
-          "c2jName" : "ServiceActionSummaries",
-          "c2jShape" : "ServiceActionSummaries",
+        "StackInstances" : {
+          "c2jName" : "StackInstances",
+          "c2jShape" : "StackInstances",
           "deprecated" : false,
-          "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
+          "documentation" : "<p>List of stack instances.</p>",
           "enumType" : null,
-          "fluentSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
-          "fluentSetterMethodName" : "withServiceActionSummaries",
-          "getterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@return An object containing information about the service actions associated with the provisioning artifact.*/",
-          "getterMethodName" : "getServiceActionSummaries",
+          "fluentSetterDocumentation" : "/**<p>List of stack instances.</p>\n@param stackInstances List of stack instances.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withStackInstances",
+          "getterDocumentation" : "/**<p>List of stack instances.</p>\n@return List of stack instances.*/",
+          "getterMethodName" : "getStackInstances",
           "getterModel" : {
-            "returnType" : "java.util.List<ServiceActionSummary>",
+            "returnType" : "java.util.List<StackInstance>",
             "documentation" : null
           },
           "http" : {
@@ -64584,11 +65686,11 @@
             "isStreaming" : false,
             "location" : null,
             "marshallLocation" : "PAYLOAD",
-            "marshallLocationName" : "ServiceActionSummaries",
+            "marshallLocationName" : "StackInstances",
             "queryString" : false,
             "requiresLength" : false,
             "statusCode" : false,
-            "unmarshallLocationName" : "ServiceActionSummaries",
+            "unmarshallLocationName" : "StackInstances",
             "uri" : false
           },
           "idempotencyToken" : false,
@@ -64600,7 +65702,7 @@
             "interfaceType" : "java.util.List",
             "listMemberModel" : {
               "c2jName" : "member",
-              "c2jShape" : "ServiceActionSummary",
+              "c2jShape" : "StackInstance",
               "deprecated" : false,
               "documentation" : "",
               "enumType" : null,
@@ -64609,7 +65711,7 @@
               "getterDocumentation" : "/**\n@return */",
               "getterMethodName" : "getMember",
               "getterModel" : {
-                "returnType" : "ServiceActionSummary",
+                "returnType" : "StackInstance",
                 "documentation" : null
               },
               "http" : {
@@ -64644,12 +65746,12 @@
               "setterMethodName" : "setMember",
               "setterModel" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "ServiceActionSummary",
+                "variableDeclarationType" : "StackInstance",
                 "variableName" : "member",
-                "variableType" : "ServiceActionSummary",
+                "variableType" : "StackInstance",
                 "documentation" : "",
-                "simpleType" : "ServiceActionSummary",
-                "variableSetterType" : "ServiceActionSummary"
+                "simpleType" : "StackInstance",
+                "variableSetterType" : "StackInstance"
               },
               "shouldEmitLegacyEnumSetter" : false,
               "simple" : false,
@@ -64657,56 +65759,56 @@
               "varargSetterDocumentation" : "/**\n@param member \n@return Returns a reference to this object so that method calls can be chained together.*/",
               "variable" : {
                 "timestampFormat" : null,
-                "variableDeclarationType" : "ServiceActionSummary",
+                "variableDeclarationType" : "StackInstance",
                 "variableName" : "member",
-                "variableType" : "ServiceActionSummary",
+                "variableType" : "StackInstance",
                 "documentation" : "",
-                "simpleType" : "ServiceActionSummary",
-                "variableSetterType" : "ServiceActionSummary"
+                "simpleType" : "StackInstance",
+                "variableSetterType" : "StackInstance"
               },
               "xmlNameSpaceUri" : null
             },
             "memberLocationName" : null,
-            "memberType" : "ServiceActionSummary",
+            "memberType" : "StackInstance",
             "map" : false,
             "marshallNonAutoConstructedEmptyLists" : false,
             "memberAdditionalMarshallingPath" : null,
             "memberAdditionalUnmarshallingPath" : null,
             "sendEmptyQueryString" : false,
             "simple" : false,
-            "simpleType" : "ServiceActionSummary",
-            "templateImplType" : "java.util.ArrayList<ServiceActionSummary>",
-            "templateType" : "java.util.List<ServiceActionSummary>"
+            "simpleType" : "StackInstance",
+            "templateImplType" : "java.util.ArrayList<StackInstance>",
+            "templateType" : "java.util.List<StackInstance>"
           },
           "map" : false,
           "mapModel" : null,
           "marshallingTargetClass" : "List",
           "marshallingType" : "LIST",
-          "name" : "ServiceActionSummaries",
+          "name" : "StackInstances",
           "sensitive" : false,
-          "setterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.*/",
-          "setterMethodName" : "setServiceActionSummaries",
+          "setterDocumentation" : "/**<p>List of stack instances.</p>\n@param stackInstances List of stack instances.*/",
+          "setterMethodName" : "setStackInstances",
           "setterModel" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
-            "variableName" : "serviceActionSummaries",
-            "variableType" : "java.util.List<ServiceActionSummary>",
+            "variableDeclarationType" : "java.util.List<StackInstance>",
+            "variableName" : "stackInstances",
+            "variableType" : "java.util.List<StackInstance>",
             "documentation" : "",
-            "simpleType" : "List<ServiceActionSummary>",
-            "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
+            "simpleType" : "List<StackInstance>",
+            "variableSetterType" : "java.util.Collection<StackInstance>"
           },
           "shouldEmitLegacyEnumSetter" : false,
           "simple" : false,
           "unmarshallingType" : null,
-          "varargSetterDocumentation" : "/**<p>An object containing information about the service actions associated with the provisioning artifact.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setServiceActionSummaries(java.util.Collection)} or {@link #withServiceActionSummaries(java.util.Collection)} if you want to override the existing values.</p>\n@param serviceActionSummaries An object containing information about the service actions associated with the provisioning artifact.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "varargSetterDocumentation" : "/**<p>List of stack instances.</p>\n<p><b>NOTE:</b> This method appends the values to the existing list (if any). Use {@link #setStackInstances(java.util.Collection)} or {@link #withStackInstances(java.util.Collection)} if you want to override the existing values.</p>\n@param stackInstances List of stack instances.\n@return Returns a reference to this object so that method calls can be chained together.*/",
           "variable" : {
             "timestampFormat" : null,
-            "variableDeclarationType" : "java.util.List<ServiceActionSummary>",
-            "variableName" : "serviceActionSummaries",
-            "variableType" : "java.util.List<ServiceActionSummary>",
-            "documentation" : "<p>An object containing information about the service actions associated with the provisioning artifact.</p>",
-            "simpleType" : "List<ServiceActionSummary>",
-            "variableSetterType" : "java.util.Collection<ServiceActionSummary>"
+            "variableDeclarationType" : "java.util.List<StackInstance>",
+            "variableName" : "stackInstances",
+            "variableType" : "java.util.List<StackInstance>",
+            "documentation" : "<p>List of stack instances.</p>",
+            "simpleType" : "List<StackInstance>",
+            "variableSetterType" : "java.util.Collection<StackInstance>"
           },
           "xmlNameSpaceUri" : null
         }
@@ -64714,7 +65816,7 @@
       "requestSignerAware" : false,
       "requestSignerClassFqcn" : null,
       "required" : null,
-      "shapeName" : "ListServiceActionsResult",
+      "shapeName" : "ListStackInstancesForProvisionedProductResult",
       "signerAware" : false,
       "signerType" : null,
       "unmarshaller" : {
@@ -64723,12 +65825,12 @@
       },
       "variable" : {
         "timestampFormat" : null,
-        "variableDeclarationType" : "ListServiceActionsResult",
-        "variableName" : "listServiceActionsResult",
-        "variableType" : "ListServiceActionsResult",
+        "variableDeclarationType" : "ListStackInstancesForProvisionedProductResult",
+        "variableName" : "listStackInstancesForProvisionedProductResult",
+        "variableType" : "ListStackInstancesForProvisionedProductResult",
         "documentation" : null,
-        "simpleType" : "ListServiceActionsResult",
-        "variableSetterType" : "ListServiceActionsResult"
+        "simpleType" : "ListStackInstancesForProvisionedProductResult",
+        "variableSetterType" : "ListStackInstancesForProvisionedProductResult"
       },
       "wrapper" : false
     },
@@ -104285,6 +105387,503 @@
       },
       "wrapper" : false
     },
+    "StackInstance" : {
+      "c2jName" : "StackInstance",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "<p>An AWS CloudFormation stack, in a specific account and region, that's part of a stack set operation. A stack instance is a reference to an attempted or actual stack in a given account within a given region. A stack instance can exist without a stack—for example, if the stack couldn't be created for some reason. A stack instance is associated with only one stack set. Each stack instance contains the ID of its associated stack set, as well as the ID of the actual stack and the stack status. </p>",
+      "enums" : null,
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : [ {
+        "c2jName" : "Account",
+        "c2jShape" : "AccountId",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the AWS account that the stack instance is associated with.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@param account The name of the AWS account that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withAccount",
+        "getterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@return The name of the AWS account that the stack instance is associated with.*/",
+        "getterMethodName" : "getAccount",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "Account",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "Account",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Account",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@param account The name of the AWS account that the stack instance is associated with.*/",
+        "setterMethodName" : "setAccount",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "account",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@param account The name of the AWS account that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "account",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the AWS account that the stack instance is associated with.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "Region",
+        "c2jShape" : "Region",
+        "deprecated" : false,
+        "documentation" : "<p>The name of the AWS region that the stack instance is associated with.</p>",
+        "enumType" : null,
+        "fluentSetterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@param region The name of the AWS region that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "fluentSetterMethodName" : "withRegion",
+        "getterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@return The name of the AWS region that the stack instance is associated with.*/",
+        "getterMethodName" : "getRegion",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "Region",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "Region",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "Region",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@param region The name of the AWS region that the stack instance is associated with.*/",
+        "setterMethodName" : "setRegion",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "region",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@param region The name of the AWS region that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "region",
+          "variableType" : "String",
+          "documentation" : "<p>The name of the AWS region that the stack instance is associated with.</p>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      }, {
+        "c2jName" : "StackInstanceStatus",
+        "c2jShape" : "StackInstanceStatus",
+        "deprecated" : false,
+        "documentation" : "<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>",
+        "enumType" : "StackInstanceStatus",
+        "fluentSetterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@param stackInstanceStatus The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.\n@see StackInstanceStatus*/",
+        "fluentSetterMethodName" : "withStackInstanceStatus",
+        "getterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@return The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@see StackInstanceStatus*/",
+        "getterMethodName" : "getStackInstanceStatus",
+        "getterModel" : {
+          "returnType" : "String",
+          "documentation" : null
+        },
+        "http" : {
+          "additionalMarshallingPath" : null,
+          "additionalUnmarshallingPath" : null,
+          "flattened" : false,
+          "greedy" : false,
+          "header" : false,
+          "isPayload" : false,
+          "isStreaming" : false,
+          "location" : null,
+          "marshallLocation" : "PAYLOAD",
+          "marshallLocationName" : "StackInstanceStatus",
+          "queryString" : false,
+          "requiresLength" : false,
+          "statusCode" : false,
+          "unmarshallLocationName" : "StackInstanceStatus",
+          "uri" : false
+        },
+        "idempotencyToken" : false,
+        "isBinary" : false,
+        "jsonValue" : false,
+        "list" : false,
+        "listModel" : null,
+        "map" : false,
+        "mapModel" : null,
+        "marshallingTargetClass" : "String",
+        "marshallingType" : "STRING",
+        "name" : "StackInstanceStatus",
+        "sensitive" : false,
+        "setterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@param stackInstanceStatus The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@see StackInstanceStatus*/",
+        "setterMethodName" : "setStackInstanceStatus",
+        "setterModel" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stackInstanceStatus",
+          "variableType" : "String",
+          "documentation" : "",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "shouldEmitLegacyEnumSetter" : false,
+        "simple" : true,
+        "unmarshallingType" : null,
+        "varargSetterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@param stackInstanceStatus The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.\n@see StackInstanceStatus*/",
+        "variable" : {
+          "timestampFormat" : null,
+          "variableDeclarationType" : "String",
+          "variableName" : "stackInstanceStatus",
+          "variableType" : "String",
+          "documentation" : "<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>",
+          "simpleType" : "String",
+          "variableSetterType" : "String"
+        },
+        "xmlNameSpaceUri" : null
+      } ],
+      "membersAsMap" : {
+        "Account" : {
+          "c2jName" : "Account",
+          "c2jShape" : "AccountId",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the AWS account that the stack instance is associated with.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@param account The name of the AWS account that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withAccount",
+          "getterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@return The name of the AWS account that the stack instance is associated with.*/",
+          "getterMethodName" : "getAccount",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "Account",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "Account",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Account",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@param account The name of the AWS account that the stack instance is associated with.*/",
+          "setterMethodName" : "setAccount",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "account",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the AWS account that the stack instance is associated with.</p>\n@param account The name of the AWS account that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "account",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the AWS account that the stack instance is associated with.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "Region" : {
+          "c2jName" : "Region",
+          "c2jShape" : "Region",
+          "deprecated" : false,
+          "documentation" : "<p>The name of the AWS region that the stack instance is associated with.</p>",
+          "enumType" : null,
+          "fluentSetterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@param region The name of the AWS region that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "fluentSetterMethodName" : "withRegion",
+          "getterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@return The name of the AWS region that the stack instance is associated with.*/",
+          "getterMethodName" : "getRegion",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "Region",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "Region",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "Region",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@param region The name of the AWS region that the stack instance is associated with.*/",
+          "setterMethodName" : "setRegion",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "region",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The name of the AWS region that the stack instance is associated with.</p>\n@param region The name of the AWS region that the stack instance is associated with.\n@return Returns a reference to this object so that method calls can be chained together.*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "region",
+            "variableType" : "String",
+            "documentation" : "<p>The name of the AWS region that the stack instance is associated with.</p>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        },
+        "StackInstanceStatus" : {
+          "c2jName" : "StackInstanceStatus",
+          "c2jShape" : "StackInstanceStatus",
+          "deprecated" : false,
+          "documentation" : "<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>",
+          "enumType" : "StackInstanceStatus",
+          "fluentSetterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@param stackInstanceStatus The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.\n@see StackInstanceStatus*/",
+          "fluentSetterMethodName" : "withStackInstanceStatus",
+          "getterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@return The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@see StackInstanceStatus*/",
+          "getterMethodName" : "getStackInstanceStatus",
+          "getterModel" : {
+            "returnType" : "String",
+            "documentation" : null
+          },
+          "http" : {
+            "additionalMarshallingPath" : null,
+            "additionalUnmarshallingPath" : null,
+            "flattened" : false,
+            "greedy" : false,
+            "header" : false,
+            "isPayload" : false,
+            "isStreaming" : false,
+            "location" : null,
+            "marshallLocation" : "PAYLOAD",
+            "marshallLocationName" : "StackInstanceStatus",
+            "queryString" : false,
+            "requiresLength" : false,
+            "statusCode" : false,
+            "unmarshallLocationName" : "StackInstanceStatus",
+            "uri" : false
+          },
+          "idempotencyToken" : false,
+          "isBinary" : false,
+          "jsonValue" : false,
+          "list" : false,
+          "listModel" : null,
+          "map" : false,
+          "mapModel" : null,
+          "marshallingTargetClass" : "String",
+          "marshallingType" : "STRING",
+          "name" : "StackInstanceStatus",
+          "sensitive" : false,
+          "setterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@param stackInstanceStatus The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@see StackInstanceStatus*/",
+          "setterMethodName" : "setStackInstanceStatus",
+          "setterModel" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stackInstanceStatus",
+            "variableType" : "String",
+            "documentation" : "",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "shouldEmitLegacyEnumSetter" : false,
+          "simple" : true,
+          "unmarshallingType" : null,
+          "varargSetterDocumentation" : "/**<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>\n@param stackInstanceStatus The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li>\n@return Returns a reference to this object so that method calls can be chained together.\n@see StackInstanceStatus*/",
+          "variable" : {
+            "timestampFormat" : null,
+            "variableDeclarationType" : "String",
+            "variableName" : "stackInstanceStatus",
+            "variableType" : "String",
+            "documentation" : "<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>",
+            "simpleType" : "String",
+            "variableSetterType" : "String"
+          },
+          "xmlNameSpaceUri" : null
+        }
+      },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "StackInstance",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StackInstance",
+        "variableName" : "stackInstance",
+        "variableType" : "StackInstance",
+        "documentation" : null,
+        "simpleType" : "StackInstance",
+        "variableSetterType" : "StackInstance"
+      },
+      "wrapper" : false
+    },
+    "StackInstanceStatus" : {
+      "c2jName" : "StackInstanceStatus",
+      "customization" : {
+        "artificialResultWrapper" : null,
+        "skipGeneratingMarshaller" : false,
+        "skipGeneratingModelClass" : false,
+        "skipGeneratingUnmarshaller" : false
+      },
+      "deprecated" : false,
+      "documentation" : "",
+      "enums" : [ {
+        "name" : "CURRENT",
+        "value" : "CURRENT"
+      }, {
+        "name" : "OUTDATED",
+        "value" : "OUTDATED"
+      }, {
+        "name" : "INOPERABLE",
+        "value" : "INOPERABLE"
+      } ],
+      "errorCode" : null,
+      "hasHeaderMember" : false,
+      "hasPayloadMember" : false,
+      "hasRequiresLengthMember" : false,
+      "hasStatusCodeMember" : false,
+      "hasStreamingMember" : false,
+      "marshaller" : null,
+      "members" : null,
+      "membersAsMap" : { },
+      "requestSignerAware" : false,
+      "requestSignerClassFqcn" : null,
+      "required" : null,
+      "shapeName" : "StackInstanceStatus",
+      "signerAware" : false,
+      "signerType" : null,
+      "unmarshaller" : {
+        "flattened" : false,
+        "resultWrapper" : null
+      },
+      "variable" : {
+        "timestampFormat" : null,
+        "variableDeclarationType" : "StackInstanceStatus",
+        "variableName" : "stackInstanceStatus",
+        "variableType" : "StackInstanceStatus",
+        "documentation" : null,
+        "simpleType" : "StackInstanceStatus",
+        "variableSetterType" : "StackInstanceStatus"
+      },
+      "wrapper" : false
+    },
     "StackSetOperationType" : {
       "c2jName" : "StackSetOperationType",
       "customization" : {
diff --git a/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-model.json b/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-model.json
index 96c4d82a0cae..5c8f707a0ed7 100644
--- a/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-model.json
+++ b/aws-java-sdk-models/src/main/resources/models/servicecatalog-2015-12-10-model.json
@@ -940,6 +940,20 @@
       ],
       "documentation":"<p>Returns a paginated list of self-service actions associated with the specified Product ID and Provisioning Artifact ID.</p>"
     },
+    "ListStackInstancesForProvisionedProduct":{
+      "name":"ListStackInstancesForProvisionedProduct",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListStackInstancesForProvisionedProductInput"},
+      "output":{"shape":"ListStackInstancesForProvisionedProductOutput"},
+      "errors":[
+        {"shape":"InvalidParametersException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Returns summary information about stack instances that are associated with the specified <code>CFN_STACKSET</code> type provisioned product. You can filter for stack instances that are associated with a specific AWS account name or region. </p>"
+    },
     "ListTagOptions":{
       "name":"ListTagOptions",
       "http":{
@@ -3556,6 +3570,41 @@
         }
       }
     },
+    "ListStackInstancesForProvisionedProductInput":{
+      "type":"structure",
+      "required":["ProvisionedProductId"],
+      "members":{
+        "AcceptLanguage":{
+          "shape":"AcceptLanguage",
+          "documentation":"<p>The language code.</p> <ul> <li> <p> <code>en</code> - English (default)</p> </li> <li> <p> <code>jp</code> - Japanese</p> </li> <li> <p> <code>zh</code> - Chinese</p> </li> </ul>"
+        },
+        "ProvisionedProductId":{
+          "shape":"Id",
+          "documentation":"<p>The identifier of the provisioned product.</p>"
+        },
+        "PageToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The page token for the next set of results. To retrieve the first set of results, use null.</p>"
+        },
+        "PageSize":{
+          "shape":"PageSize",
+          "documentation":"<p>The maximum number of items to return with this call.</p>"
+        }
+      }
+    },
+    "ListStackInstancesForProvisionedProductOutput":{
+      "type":"structure",
+      "members":{
+        "StackInstances":{
+          "shape":"StackInstances",
+          "documentation":"<p>List of stack instances.</p>"
+        },
+        "NextPageToken":{
+          "shape":"PageToken",
+          "documentation":"<p>The page token to use to retrieve the next set of results. If there are no additional results, this value is null.</p>"
+        }
+      }
+    },
     "ListTagOptionsFilters":{
       "type":"structure",
       "members":{
@@ -5262,6 +5311,36 @@
       "key":{"shape":"ProvisioningArtifactPropertyName"},
       "value":{"shape":"ProvisioningArtifactPropertyValue"}
     },
+    "StackInstance":{
+      "type":"structure",
+      "members":{
+        "Account":{
+          "shape":"AccountId",
+          "documentation":"<p>The name of the AWS account that the stack instance is associated with.</p>"
+        },
+        "Region":{
+          "shape":"Region",
+          "documentation":"<p>The name of the AWS region that the stack instance is associated with.</p>"
+        },
+        "StackInstanceStatus":{
+          "shape":"StackInstanceStatus",
+          "documentation":"<p>The status of the stack instance, in terms of its synchronization with its associated stack set. </p> <ul> <li> <p> <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to delete the stack instance, and then delete the stack manually. </p> </li> <li> <p> <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the stack was created or updated.</p> </li> <li> <p> <code>CURRENT</code>: The stack is currently up to date with the stack set.</p> </li> </ul>"
+        }
+      },
+      "documentation":"<p>An AWS CloudFormation stack, in a specific account and region, that's part of a stack set operation. A stack instance is a reference to an attempted or actual stack in a given account within a given region. A stack instance can exist without a stack—for example, if the stack couldn't be created for some reason. A stack instance is associated with only one stack set. Each stack instance contains the ID of its associated stack set, as well as the ID of the actual stack and the stack status. </p>"
+    },
+    "StackInstanceStatus":{
+      "type":"string",
+      "enum":[
+        "CURRENT",
+        "OUTDATED",
+        "INOPERABLE"
+      ]
+    },
+    "StackInstances":{
+      "type":"list",
+      "member":{"shape":"StackInstance"}
+    },
     "StackSetAccounts":{
       "type":"list",
       "member":{"shape":"AccountId"}
diff --git a/aws-java-sdk-models/src/main/resources/models/tagging-2017-01-26-intermediate.json b/aws-java-sdk-models/src/main/resources/models/tagging-2017-01-26-intermediate.json
index 50c271dbe561..366e2683df81 100644
--- a/aws-java-sdk-models/src/main/resources/models/tagging-2017-01-26-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/tagging-2017-01-26-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
+    "deprecatedSuppressions" : [ "ClientConstructors", "EnumSetterOverload", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : {
       "FailureInfo" : [ "ErrorCode" ]
     },
diff --git a/aws-java-sdk-models/src/main/resources/models/translate-2017-07-01-intermediate.json b/aws-java-sdk-models/src/main/resources/models/translate-2017-07-01-intermediate.json
index 8eb15ef594ca..abe86fc13438 100644
--- a/aws-java-sdk-models/src/main/resources/models/translate-2017-07-01-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/translate-2017-07-01-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "ClientMutationMethods", "EnumSetterOverload", "ClientConstructors" ],
     "emitLegacyEnumSetterFor" : null,
     "operationModifiers" : null,
     "operationsWithResponseStreamContentLengthValidation" : null,
diff --git a/aws-java-sdk-models/src/main/resources/models/workdocs-2016-05-01-intermediate.json b/aws-java-sdk-models/src/main/resources/models/workdocs-2016-05-01-intermediate.json
index 3b03df0c3bf2..b32579d53100 100644
--- a/aws-java-sdk-models/src/main/resources/models/workdocs-2016-05-01-intermediate.json
+++ b/aws-java-sdk-models/src/main/resources/models/workdocs-2016-05-01-intermediate.json
@@ -20,7 +20,7 @@
     "customServiceMetadata" : null,
     "customServiceNameForRequest" : null,
     "customSignerProvider" : null,
-    "deprecatedSuppressions" : [ "ClientMutationMethods", "ClientConstructors", "EnumSetterOverload" ],
+    "deprecatedSuppressions" : [ "EnumSetterOverload", "ClientConstructors", "ClientMutationMethods" ],
     "emitLegacyEnumSetterFor" : {
       "Activity" : [ "Type" ],
       "Comment" : [ "Status", "Visibility" ],
diff --git a/aws-java-sdk-mq/pom.xml b/aws-java-sdk-mq/pom.xml
index 9aac6b55bf0f..b7e4a6d089bb 100644
--- a/aws-java-sdk-mq/pom.xml
+++ b/aws-java-sdk-mq/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-mq</artifactId>
diff --git a/aws-java-sdk-neptune/pom.xml b/aws-java-sdk-neptune/pom.xml
index 016cfd760af0..7be0b052525e 100644
--- a/aws-java-sdk-neptune/pom.xml
+++ b/aws-java-sdk-neptune/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-neptune</artifactId>
diff --git a/aws-java-sdk-opensdk/pom.xml b/aws-java-sdk-opensdk/pom.xml
index 5c5f0e6837ec..e60646d1ad62 100644
--- a/aws-java-sdk-opensdk/pom.xml
+++ b/aws-java-sdk-opensdk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
 	<groupId>com.amazonaws</groupId>
 	<artifactId>aws-java-sdk-pom</artifactId>
-	<version>1.11.563-SNAPSHOT</version>
+	<version>1.11.563</version>
     </parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-opensdk</artifactId>
@@ -22,7 +22,7 @@
 	    <artifactId>aws-java-sdk-core</artifactId>
 	    <groupId>com.amazonaws</groupId>
 	    <optional>false</optional>
-	   <version>1.11.563-SNAPSHOT</version>
+	   <version>1.11.563</version>
 	</dependency>
     </dependencies>
     <build>
diff --git a/aws-java-sdk-opsworks/pom.xml b/aws-java-sdk-opsworks/pom.xml
index af909031e5b5..b6af87cd8377 100644
--- a/aws-java-sdk-opsworks/pom.xml
+++ b/aws-java-sdk-opsworks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-opsworks</artifactId>
diff --git a/aws-java-sdk-opsworkscm/pom.xml b/aws-java-sdk-opsworkscm/pom.xml
index 6cb97dbb6bd3..cc9cea1c11a0 100644
--- a/aws-java-sdk-opsworkscm/pom.xml
+++ b/aws-java-sdk-opsworkscm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-opsworkscm</artifactId>
diff --git a/aws-java-sdk-organizations/pom.xml b/aws-java-sdk-organizations/pom.xml
index 1af74951a814..622a72a0f76e 100644
--- a/aws-java-sdk-organizations/pom.xml
+++ b/aws-java-sdk-organizations/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-organizations</artifactId>
diff --git a/aws-java-sdk-osgi/pom.xml b/aws-java-sdk-osgi/pom.xml
index 58ebeefa149b..de9c581f5c28 100644
--- a/aws-java-sdk-osgi/pom.xml
+++ b/aws-java-sdk-osgi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-osgi</artifactId>
@@ -15,6 +15,18 @@
 
   <!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
   <dependencies>
+    <dependency>
+        <artifactId>aws-java-sdk-ioteventsdata</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>aws-java-sdk-iotevents</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
     <dependency>
         <artifactId>aws-java-sdk-iotthingsgraph</artifactId>
         <groupId>com.amazonaws</groupId>
@@ -1184,6 +1196,14 @@
                               </taglet>
                           </taglets>
                           <groups>
+                              <group>
+                                  <title>AWS IoT Events Data</title>
+                                  <packages>com.amazonaws.services.ioteventsdata*</packages>
+                              </group>
+                              <group>
+                                  <title>AWS IoT Events</title>
+                                  <packages>com.amazonaws.services.iotevents*</packages>
+                              </group>
                               <group>
                                   <title>AWS IoT Things Graph</title>
                                   <packages>com.amazonaws.services.iotthingsgraph*</packages>
diff --git a/aws-java-sdk-pi/pom.xml b/aws-java-sdk-pi/pom.xml
index 7c69364e908f..d63e08b16e87 100644
--- a/aws-java-sdk-pi/pom.xml
+++ b/aws-java-sdk-pi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-pi</artifactId>
diff --git a/aws-java-sdk-pinpoint/pom.xml b/aws-java-sdk-pinpoint/pom.xml
index f06fc29b3513..1b8f1497e59d 100644
--- a/aws-java-sdk-pinpoint/pom.xml
+++ b/aws-java-sdk-pinpoint/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-pinpoint</artifactId>
diff --git a/aws-java-sdk-pinpointemail/pom.xml b/aws-java-sdk-pinpointemail/pom.xml
index 8384df7ab57b..1ff1fdfbbb90 100644
--- a/aws-java-sdk-pinpointemail/pom.xml
+++ b/aws-java-sdk-pinpointemail/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-pinpointemail</artifactId>
diff --git a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/DeliveryOptions.java b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/DeliveryOptions.java
index c630dc33e6f1..86d734dcc2fd 100644
--- a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/DeliveryOptions.java
+++ b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/DeliveryOptions.java
@@ -28,6 +28,14 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class DeliveryOptions implements Serializable, Cloneable, StructuredPojo {
 
+    /**
+     * <p>
+     * Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     * encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint
+     * will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.
+     * </p>
+     */
+    private String tlsPolicy;
     /**
      * <p>
      * The name of the dedicated IP pool that you want to associate with the configuration set.
@@ -35,6 +43,85 @@ public class DeliveryOptions implements Serializable, Cloneable, StructuredPojo
      */
     private String sendingPoolName;
 
+    /**
+     * <p>
+     * Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     * encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint
+     * will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.
+     * </p>
+     * 
+     * @param tlsPolicy
+     *        Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     *        encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon
+     *        Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is
+     *        <code>Optional</code>.
+     * @see TlsPolicy
+     */
+
+    public void setTlsPolicy(String tlsPolicy) {
+        this.tlsPolicy = tlsPolicy;
+    }
+
+    /**
+     * <p>
+     * Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     * encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint
+     * will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.
+     * </p>
+     * 
+     * @return Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection
+     *         that’s encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>,
+     *         Amazon Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is
+     *         <code>Optional</code>.
+     * @see TlsPolicy
+     */
+
+    public String getTlsPolicy() {
+        return this.tlsPolicy;
+    }
+
+    /**
+     * <p>
+     * Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     * encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint
+     * will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.
+     * </p>
+     * 
+     * @param tlsPolicy
+     *        Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     *        encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon
+     *        Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is
+     *        <code>Optional</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see TlsPolicy
+     */
+
+    public DeliveryOptions withTlsPolicy(String tlsPolicy) {
+        setTlsPolicy(tlsPolicy);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     * encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon Pinpoint
+     * will bounce email messages that cannot be delivered over TLS. The default value is <code>Optional</code>.
+     * </p>
+     * 
+     * @param tlsPolicy
+     *        Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection that’s
+     *        encrypted by using Transport Layer Security (TLS). If this value is set to <code>Require</code>, Amazon
+     *        Pinpoint will bounce email messages that cannot be delivered over TLS. The default value is
+     *        <code>Optional</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see TlsPolicy
+     */
+
+    public DeliveryOptions withTlsPolicy(TlsPolicy tlsPolicy) {
+        this.tlsPolicy = tlsPolicy.toString();
+        return this;
+    }
+
     /**
      * <p>
      * The name of the dedicated IP pool that you want to associate with the configuration set.
@@ -87,6 +174,8 @@ public DeliveryOptions withSendingPoolName(String sendingPoolName) {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("{");
+        if (getTlsPolicy() != null)
+            sb.append("TlsPolicy: ").append(getTlsPolicy()).append(",");
         if (getSendingPoolName() != null)
             sb.append("SendingPoolName: ").append(getSendingPoolName());
         sb.append("}");
@@ -103,6 +192,10 @@ public boolean equals(Object obj) {
         if (obj instanceof DeliveryOptions == false)
             return false;
         DeliveryOptions other = (DeliveryOptions) obj;
+        if (other.getTlsPolicy() == null ^ this.getTlsPolicy() == null)
+            return false;
+        if (other.getTlsPolicy() != null && other.getTlsPolicy().equals(this.getTlsPolicy()) == false)
+            return false;
         if (other.getSendingPoolName() == null ^ this.getSendingPoolName() == null)
             return false;
         if (other.getSendingPoolName() != null && other.getSendingPoolName().equals(this.getSendingPoolName()) == false)
@@ -115,6 +208,7 @@ public int hashCode() {
         final int prime = 31;
         int hashCode = 1;
 
+        hashCode = prime * hashCode + ((getTlsPolicy() == null) ? 0 : getTlsPolicy().hashCode());
         hashCode = prime * hashCode + ((getSendingPoolName() == null) ? 0 : getSendingPoolName().hashCode());
         return hashCode;
     }
diff --git a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/PutConfigurationSetDeliveryOptionsRequest.java b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/PutConfigurationSetDeliveryOptionsRequest.java
index e8a00f7f1175..fabffb38c2ae 100644
--- a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/PutConfigurationSetDeliveryOptionsRequest.java
+++ b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/PutConfigurationSetDeliveryOptionsRequest.java
@@ -34,6 +34,13 @@ public class PutConfigurationSetDeliveryOptionsRequest extends com.amazonaws.Ama
      * </p>
      */
     private String configurationSetName;
+    /**
+     * <p>
+     * Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     * Transport Layer Security (TLS).
+     * </p>
+     */
+    private String tlsPolicy;
     /**
      * <p>
      * The name of the dedicated IP pool that you want to associate with the configuration set.
@@ -81,6 +88,73 @@ public PutConfigurationSetDeliveryOptionsRequest withConfigurationSetName(String
         return this;
     }
 
+    /**
+     * <p>
+     * Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     * Transport Layer Security (TLS).
+     * </p>
+     * 
+     * @param tlsPolicy
+     *        Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     *        Transport Layer Security (TLS).
+     * @see TlsPolicy
+     */
+
+    public void setTlsPolicy(String tlsPolicy) {
+        this.tlsPolicy = tlsPolicy;
+    }
+
+    /**
+     * <p>
+     * Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     * Transport Layer Security (TLS).
+     * </p>
+     * 
+     * @return Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     *         Transport Layer Security (TLS).
+     * @see TlsPolicy
+     */
+
+    public String getTlsPolicy() {
+        return this.tlsPolicy;
+    }
+
+    /**
+     * <p>
+     * Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     * Transport Layer Security (TLS).
+     * </p>
+     * 
+     * @param tlsPolicy
+     *        Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     *        Transport Layer Security (TLS).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see TlsPolicy
+     */
+
+    public PutConfigurationSetDeliveryOptionsRequest withTlsPolicy(String tlsPolicy) {
+        setTlsPolicy(tlsPolicy);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     * Transport Layer Security (TLS).
+     * </p>
+     * 
+     * @param tlsPolicy
+     *        Whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+     *        Transport Layer Security (TLS).
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see TlsPolicy
+     */
+
+    public PutConfigurationSetDeliveryOptionsRequest withTlsPolicy(TlsPolicy tlsPolicy) {
+        this.tlsPolicy = tlsPolicy.toString();
+        return this;
+    }
+
     /**
      * <p>
      * The name of the dedicated IP pool that you want to associate with the configuration set.
@@ -135,6 +209,8 @@ public String toString() {
         sb.append("{");
         if (getConfigurationSetName() != null)
             sb.append("ConfigurationSetName: ").append(getConfigurationSetName()).append(",");
+        if (getTlsPolicy() != null)
+            sb.append("TlsPolicy: ").append(getTlsPolicy()).append(",");
         if (getSendingPoolName() != null)
             sb.append("SendingPoolName: ").append(getSendingPoolName());
         sb.append("}");
@@ -155,6 +231,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getConfigurationSetName() != null && other.getConfigurationSetName().equals(this.getConfigurationSetName()) == false)
             return false;
+        if (other.getTlsPolicy() == null ^ this.getTlsPolicy() == null)
+            return false;
+        if (other.getTlsPolicy() != null && other.getTlsPolicy().equals(this.getTlsPolicy()) == false)
+            return false;
         if (other.getSendingPoolName() == null ^ this.getSendingPoolName() == null)
             return false;
         if (other.getSendingPoolName() != null && other.getSendingPoolName().equals(this.getSendingPoolName()) == false)
@@ -168,6 +248,7 @@ public int hashCode() {
         int hashCode = 1;
 
         hashCode = prime * hashCode + ((getConfigurationSetName() == null) ? 0 : getConfigurationSetName().hashCode());
+        hashCode = prime * hashCode + ((getTlsPolicy() == null) ? 0 : getTlsPolicy().hashCode());
         hashCode = prime * hashCode + ((getSendingPoolName() == null) ? 0 : getSendingPoolName().hashCode());
         return hashCode;
     }
diff --git a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/TlsPolicy.java b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/TlsPolicy.java
new file mode 100644
index 000000000000..597c7e28def4
--- /dev/null
+++ b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/TlsPolicy.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2019 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.pinpointemail.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * Specifies whether Amazon Pinpoint should require that incoming email is delivered over a connection encrypted with
+ * Transport Layer Security (TLS). If this parameter is set to <code>Require</code>, Amazon Pinpoint rejects emails that
+ * weren't received over TLS. If the parameter is set to <code>Optional</code>, then Amazon Pinpoint accepts emails that
+ * weren't received over TLS. The default value is <code>Optional</code>.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum TlsPolicy {
+
+    REQUIRE("REQUIRE"),
+    OPTIONAL("OPTIONAL");
+
+    private String value;
+
+    private TlsPolicy(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return TlsPolicy corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static TlsPolicy fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (TlsPolicy enumEntry : TlsPolicy.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsJsonUnmarshaller.java b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsJsonUnmarshaller.java
index 7d1788b85796..b2bf70d61deb 100644
--- a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsJsonUnmarshaller.java
+++ b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsJsonUnmarshaller.java
@@ -48,6 +48,10 @@ public DeliveryOptions unmarshall(JsonUnmarshallerContext context) throws Except
                 break;
 
             if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("TlsPolicy", targetDepth)) {
+                    context.nextToken();
+                    deliveryOptions.setTlsPolicy(context.getUnmarshaller(String.class).unmarshall(context));
+                }
                 if (context.testExpression("SendingPoolName", targetDepth)) {
                     context.nextToken();
                     deliveryOptions.setSendingPoolName(context.getUnmarshaller(String.class).unmarshall(context));
diff --git a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsMarshaller.java b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsMarshaller.java
index ec7c52da29c8..eb9a60190e3b 100644
--- a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsMarshaller.java
+++ b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/DeliveryOptionsMarshaller.java
@@ -27,6 +27,8 @@
 @SdkInternalApi
 public class DeliveryOptionsMarshaller {
 
+    private static final MarshallingInfo<String> TLSPOLICY_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("TlsPolicy").build();
     private static final MarshallingInfo<String> SENDINGPOOLNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("SendingPoolName").build();
 
@@ -46,6 +48,7 @@ public void marshall(DeliveryOptions deliveryOptions, ProtocolMarshaller protoco
         }
 
         try {
+            protocolMarshaller.marshall(deliveryOptions.getTlsPolicy(), TLSPOLICY_BINDING);
             protocolMarshaller.marshall(deliveryOptions.getSendingPoolName(), SENDINGPOOLNAME_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
diff --git a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/PutConfigurationSetDeliveryOptionsRequestMarshaller.java b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/PutConfigurationSetDeliveryOptionsRequestMarshaller.java
index 9e213b914295..c5b9c0060db8 100644
--- a/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/PutConfigurationSetDeliveryOptionsRequestMarshaller.java
+++ b/aws-java-sdk-pinpointemail/src/main/java/com/amazonaws/services/pinpointemail/model/transform/PutConfigurationSetDeliveryOptionsRequestMarshaller.java
@@ -29,6 +29,8 @@ public class PutConfigurationSetDeliveryOptionsRequestMarshaller {
 
     private static final MarshallingInfo<String> CONFIGURATIONSETNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PATH).marshallLocationName("ConfigurationSetName").build();
+    private static final MarshallingInfo<String> TLSPOLICY_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("TlsPolicy").build();
     private static final MarshallingInfo<String> SENDINGPOOLNAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
             .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("SendingPoolName").build();
 
@@ -49,6 +51,7 @@ public void marshall(PutConfigurationSetDeliveryOptionsRequest putConfigurationS
 
         try {
             protocolMarshaller.marshall(putConfigurationSetDeliveryOptionsRequest.getConfigurationSetName(), CONFIGURATIONSETNAME_BINDING);
+            protocolMarshaller.marshall(putConfigurationSetDeliveryOptionsRequest.getTlsPolicy(), TLSPOLICY_BINDING);
             protocolMarshaller.marshall(putConfigurationSetDeliveryOptionsRequest.getSendingPoolName(), SENDINGPOOLNAME_BINDING);
         } catch (Exception e) {
             throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
diff --git a/aws-java-sdk-pinpointsmsvoice/pom.xml b/aws-java-sdk-pinpointsmsvoice/pom.xml
index ee33a138055d..6888fd54614b 100644
--- a/aws-java-sdk-pinpointsmsvoice/pom.xml
+++ b/aws-java-sdk-pinpointsmsvoice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-pinpointsmsvoice</artifactId>
diff --git a/aws-java-sdk-polly/pom.xml b/aws-java-sdk-polly/pom.xml
index 83ce69438e16..11d22fe16808 100644
--- a/aws-java-sdk-polly/pom.xml
+++ b/aws-java-sdk-polly/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-polly</artifactId>
diff --git a/aws-java-sdk-pricing/pom.xml b/aws-java-sdk-pricing/pom.xml
index 91908f449a5e..71b42a229d7a 100644
--- a/aws-java-sdk-pricing/pom.xml
+++ b/aws-java-sdk-pricing/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-pricing</artifactId>
diff --git a/aws-java-sdk-quicksight/pom.xml b/aws-java-sdk-quicksight/pom.xml
index a2341f30a071..8f5f1a5b5fdc 100644
--- a/aws-java-sdk-quicksight/pom.xml
+++ b/aws-java-sdk-quicksight/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-quicksight</artifactId>
diff --git a/aws-java-sdk-ram/pom.xml b/aws-java-sdk-ram/pom.xml
index ae8b9230eb31..9b23888511d2 100644
--- a/aws-java-sdk-ram/pom.xml
+++ b/aws-java-sdk-ram/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-ram</artifactId>
diff --git a/aws-java-sdk-rds/pom.xml b/aws-java-sdk-rds/pom.xml
index 3e3452a19912..9ed05aaeb2f4 100644
--- a/aws-java-sdk-rds/pom.xml
+++ b/aws-java-sdk-rds/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-rds</artifactId>
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/auth/policy/actions/RDSActions.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/auth/policy/actions/RDSActions.java
index eab8e1495454..ce0658d92131 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/auth/policy/actions/RDSActions.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/auth/policy/actions/RDSActions.java
@@ -235,10 +235,14 @@ public enum RDSActions implements Action {
     RestoreDBInstanceToPointInTime("rds:RestoreDBInstanceToPointInTime"),
     /** Action for the RevokeDBSecurityGroupIngress operation. */
     RevokeDBSecurityGroupIngress("rds:RevokeDBSecurityGroupIngress"),
+    /** Action for the StartActivityStream operation. */
+    StartActivityStream("rds:StartActivityStream"),
     /** Action for the StartDBCluster operation. */
     StartDBCluster("rds:StartDBCluster"),
     /** Action for the StartDBInstance operation. */
     StartDBInstance("rds:StartDBInstance"),
+    /** Action for the StopActivityStream operation. */
+    StopActivityStream("rds:StopActivityStream"),
     /** Action for the StopDBCluster operation. */
     StopDBCluster("rds:StopDBCluster"),
     /** Action for the StopDBInstance operation. */
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDS.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDS.java
index e8c3744c5260..30b014311bc0 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDS.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDS.java
@@ -663,6 +663,11 @@ public DBSecurityGroup revokeDBSecurityGroupIngress(RevokeDBSecurityGroupIngress
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public StartActivityStreamResult startActivityStream(StartActivityStreamRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public DBCluster startDBCluster(StartDBClusterRequest request) {
         throw new java.lang.UnsupportedOperationException();
@@ -673,6 +678,11 @@ public DBInstance startDBInstance(StartDBInstanceRequest request) {
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public StopActivityStreamResult stopActivityStream(StopActivityStreamRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public DBCluster stopDBCluster(StopDBClusterRequest request) {
         throw new java.lang.UnsupportedOperationException();
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDSAsync.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDSAsync.java
index a72f36078b9f..81b48f15cc2c 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDSAsync.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AbstractAmazonRDSAsync.java
@@ -1868,6 +1868,19 @@ public java.util.concurrent.Future<DBSecurityGroup> revokeDBSecurityGroupIngress
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<StartActivityStreamResult> startActivityStreamAsync(StartActivityStreamRequest request) {
+
+        return startActivityStreamAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<StartActivityStreamResult> startActivityStreamAsync(StartActivityStreamRequest request,
+            com.amazonaws.handlers.AsyncHandler<StartActivityStreamRequest, StartActivityStreamResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<DBCluster> startDBClusterAsync(StartDBClusterRequest request) {
 
@@ -1894,6 +1907,19 @@ public java.util.concurrent.Future<DBInstance> startDBInstanceAsync(StartDBInsta
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<StopActivityStreamResult> stopActivityStreamAsync(StopActivityStreamRequest request) {
+
+        return stopActivityStreamAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<StopActivityStreamResult> stopActivityStreamAsync(StopActivityStreamRequest request,
+            com.amazonaws.handlers.AsyncHandler<StopActivityStreamRequest, StopActivityStreamResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<DBCluster> stopDBClusterAsync(StopDBClusterRequest request) {
 
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDS.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDS.java
index 9d983aa0a224..0e4828acd331 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDS.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDS.java
@@ -3372,6 +3372,33 @@ ValidDBInstanceModificationsMessage describeValidDBInstanceModifications(
      */
     DBSecurityGroup revokeDBSecurityGroupIngress(RevokeDBSecurityGroupIngressRequest revokeDBSecurityGroupIngressRequest);
 
+    /**
+     * <p>
+     * Starts a database activity stream to monitor activity on the database. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param startActivityStreamRequest
+     * @return Result of the StartActivityStream operation returned by the service.
+     * @throws InvalidDBInstanceStateException
+     *         The DB instance isn't in a valid state.
+     * @throws InvalidDBClusterStateException
+     *         The requested operation can't be performed while the cluster is in this state.
+     * @throws ResourceNotFoundException
+     *         The specified resource ID was not found.
+     * @throws DBClusterNotFoundException
+     *         <i>DBClusterIdentifier</i> doesn't refer to an existing DB cluster.
+     * @throws DBInstanceNotFoundException
+     *         <i>DBInstanceIdentifier</i> doesn't refer to an existing DB instance.
+     * @throws KMSKeyNotAccessibleException
+     *         An error occurred accessing an AWS KMS key.
+     * @sample AmazonRDS.StartActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    StartActivityStreamResult startActivityStream(StartActivityStreamRequest startActivityStreamRequest);
+
     /**
      * <p>
      * Starts an Amazon Aurora DB cluster that was stopped using the AWS console, the stop-db-cluster AWS CLI command,
@@ -3453,6 +3480,35 @@ ValidDBInstanceModificationsMessage describeValidDBInstanceModifications(
      */
     DBInstance startDBInstance(StartDBInstanceRequest startDBInstanceRequest);
 
+    /**
+     * <p>
+     * Stops a database activity stream that was started using the AWS console, the <code>start-activity-stream</code>
+     * AWS CLI command, or the <code>StartActivityStream</code> action.
+     * </p>
+     * <p>
+     * For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param stopActivityStreamRequest
+     * @return Result of the StopActivityStream operation returned by the service.
+     * @throws InvalidDBInstanceStateException
+     *         The DB instance isn't in a valid state.
+     * @throws InvalidDBClusterStateException
+     *         The requested operation can't be performed while the cluster is in this state.
+     * @throws ResourceNotFoundException
+     *         The specified resource ID was not found.
+     * @throws DBClusterNotFoundException
+     *         <i>DBClusterIdentifier</i> doesn't refer to an existing DB cluster.
+     * @throws DBInstanceNotFoundException
+     *         <i>DBInstanceIdentifier</i> doesn't refer to an existing DB instance.
+     * @sample AmazonRDS.StopActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StopActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    StopActivityStreamResult stopActivityStream(StopActivityStreamRequest stopActivityStreamRequest);
+
     /**
      * <p>
      * Stops an Amazon Aurora DB cluster. When you stop a DB cluster, Aurora retains the DB cluster's metadata,
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsync.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsync.java
index a12809a9d74e..fe1628ae831a 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsync.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsync.java
@@ -5465,6 +5465,41 @@ java.util.concurrent.Future<DBInstance> restoreDBInstanceToPointInTimeAsync(Rest
     java.util.concurrent.Future<DBSecurityGroup> revokeDBSecurityGroupIngressAsync(RevokeDBSecurityGroupIngressRequest revokeDBSecurityGroupIngressRequest,
             com.amazonaws.handlers.AsyncHandler<RevokeDBSecurityGroupIngressRequest, DBSecurityGroup> asyncHandler);
 
+    /**
+     * <p>
+     * Starts a database activity stream to monitor activity on the database. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param startActivityStreamRequest
+     * @return A Java Future containing the result of the StartActivityStream operation returned by the service.
+     * @sample AmazonRDSAsync.StartActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<StartActivityStreamResult> startActivityStreamAsync(StartActivityStreamRequest startActivityStreamRequest);
+
+    /**
+     * <p>
+     * Starts a database activity stream to monitor activity on the database. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param startActivityStreamRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the StartActivityStream operation returned by the service.
+     * @sample AmazonRDSAsyncHandler.StartActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<StartActivityStreamResult> startActivityStreamAsync(StartActivityStreamRequest startActivityStreamRequest,
+            com.amazonaws.handlers.AsyncHandler<StartActivityStreamRequest, StartActivityStreamResult> asyncHandler);
+
     /**
      * <p>
      * Starts an Amazon Aurora DB cluster that was stopped using the AWS console, the stop-db-cluster AWS CLI command,
@@ -5573,6 +5608,49 @@ java.util.concurrent.Future<DBCluster> startDBClusterAsync(StartDBClusterRequest
     java.util.concurrent.Future<DBInstance> startDBInstanceAsync(StartDBInstanceRequest startDBInstanceRequest,
             com.amazonaws.handlers.AsyncHandler<StartDBInstanceRequest, DBInstance> asyncHandler);
 
+    /**
+     * <p>
+     * Stops a database activity stream that was started using the AWS console, the <code>start-activity-stream</code>
+     * AWS CLI command, or the <code>StartActivityStream</code> action.
+     * </p>
+     * <p>
+     * For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param stopActivityStreamRequest
+     * @return A Java Future containing the result of the StopActivityStream operation returned by the service.
+     * @sample AmazonRDSAsync.StopActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StopActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<StopActivityStreamResult> stopActivityStreamAsync(StopActivityStreamRequest stopActivityStreamRequest);
+
+    /**
+     * <p>
+     * Stops a database activity stream that was started using the AWS console, the <code>start-activity-stream</code>
+     * AWS CLI command, or the <code>StartActivityStream</code> action.
+     * </p>
+     * <p>
+     * For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param stopActivityStreamRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the StopActivityStream operation returned by the service.
+     * @sample AmazonRDSAsyncHandler.StopActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StopActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<StopActivityStreamResult> stopActivityStreamAsync(StopActivityStreamRequest stopActivityStreamRequest,
+            com.amazonaws.handlers.AsyncHandler<StopActivityStreamRequest, StopActivityStreamResult> asyncHandler);
+
     /**
      * <p>
      * Stops an Amazon Aurora DB cluster. When you stop a DB cluster, Aurora retains the DB cluster's metadata,
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsyncClient.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsyncClient.java
index 294b5acddb6c..e253c4d2ec0f 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsyncClient.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSAsyncClient.java
@@ -4259,6 +4259,39 @@ public DBSecurityGroup call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<StartActivityStreamResult> startActivityStreamAsync(StartActivityStreamRequest request) {
+
+        return startActivityStreamAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<StartActivityStreamResult> startActivityStreamAsync(final StartActivityStreamRequest request,
+            final com.amazonaws.handlers.AsyncHandler<StartActivityStreamRequest, StartActivityStreamResult> asyncHandler) {
+        final StartActivityStreamRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<StartActivityStreamResult>() {
+            @Override
+            public StartActivityStreamResult call() throws Exception {
+                StartActivityStreamResult result = null;
+
+                try {
+                    result = executeStartActivityStream(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<DBCluster> startDBClusterAsync(StartDBClusterRequest request) {
 
@@ -4325,6 +4358,39 @@ public DBInstance call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<StopActivityStreamResult> stopActivityStreamAsync(StopActivityStreamRequest request) {
+
+        return stopActivityStreamAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<StopActivityStreamResult> stopActivityStreamAsync(final StopActivityStreamRequest request,
+            final com.amazonaws.handlers.AsyncHandler<StopActivityStreamRequest, StopActivityStreamResult> asyncHandler) {
+        final StopActivityStreamRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<StopActivityStreamResult>() {
+            @Override
+            public StopActivityStreamResult call() throws Exception {
+                StopActivityStreamResult result = null;
+
+                try {
+                    result = executeStopActivityStream(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<DBCluster> stopDBClusterAsync(StopDBClusterRequest request) {
 
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSClient.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSClient.java
index fafda01a3d7e..86e40495a12d 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSClient.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/AmazonRDSClient.java
@@ -7779,6 +7779,73 @@ final DBSecurityGroup executeRevokeDBSecurityGroupIngress(RevokeDBSecurityGroupI
         }
     }
 
+    /**
+     * <p>
+     * Starts a database activity stream to monitor activity on the database. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param startActivityStreamRequest
+     * @return Result of the StartActivityStream operation returned by the service.
+     * @throws InvalidDBInstanceStateException
+     *         The DB instance isn't in a valid state.
+     * @throws InvalidDBClusterStateException
+     *         The requested operation can't be performed while the cluster is in this state.
+     * @throws ResourceNotFoundException
+     *         The specified resource ID was not found.
+     * @throws DBClusterNotFoundException
+     *         <i>DBClusterIdentifier</i> doesn't refer to an existing DB cluster.
+     * @throws DBInstanceNotFoundException
+     *         <i>DBInstanceIdentifier</i> doesn't refer to an existing DB instance.
+     * @throws KMSKeyNotAccessibleException
+     *         An error occurred accessing an AWS KMS key.
+     * @sample AmazonRDS.StartActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public StartActivityStreamResult startActivityStream(StartActivityStreamRequest request) {
+        request = beforeClientExecution(request);
+        return executeStartActivityStream(request);
+    }
+
+    @SdkInternalApi
+    final StartActivityStreamResult executeStartActivityStream(StartActivityStreamRequest startActivityStreamRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(startActivityStreamRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<StartActivityStreamRequest> request = null;
+        Response<StartActivityStreamResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new StartActivityStreamRequestMarshaller().marshall(super.beforeMarshalling(startActivityStreamRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "StartActivityStream");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            StaxResponseHandler<StartActivityStreamResult> responseHandler = new StaxResponseHandler<StartActivityStreamResult>(
+                    new StartActivityStreamResultStaxUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Starts an Amazon Aurora DB cluster that was stopped using the AWS console, the stop-db-cluster AWS CLI command,
@@ -7938,6 +8005,75 @@ final DBInstance executeStartDBInstance(StartDBInstanceRequest startDBInstanceRe
         }
     }
 
+    /**
+     * <p>
+     * Stops a database activity stream that was started using the AWS console, the <code>start-activity-stream</code>
+     * AWS CLI command, or the <code>StartActivityStream</code> action.
+     * </p>
+     * <p>
+     * For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/DBActivityStreams.html">Database Activity
+     * Streams</a> in the <i>Amazon Aurora User Guide</i>.
+     * </p>
+     * 
+     * @param stopActivityStreamRequest
+     * @return Result of the StopActivityStream operation returned by the service.
+     * @throws InvalidDBInstanceStateException
+     *         The DB instance isn't in a valid state.
+     * @throws InvalidDBClusterStateException
+     *         The requested operation can't be performed while the cluster is in this state.
+     * @throws ResourceNotFoundException
+     *         The specified resource ID was not found.
+     * @throws DBClusterNotFoundException
+     *         <i>DBClusterIdentifier</i> doesn't refer to an existing DB cluster.
+     * @throws DBInstanceNotFoundException
+     *         <i>DBInstanceIdentifier</i> doesn't refer to an existing DB instance.
+     * @sample AmazonRDS.StopActivityStream
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StopActivityStream" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public StopActivityStreamResult stopActivityStream(StopActivityStreamRequest request) {
+        request = beforeClientExecution(request);
+        return executeStopActivityStream(request);
+    }
+
+    @SdkInternalApi
+    final StopActivityStreamResult executeStopActivityStream(StopActivityStreamRequest stopActivityStreamRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(stopActivityStreamRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<StopActivityStreamRequest> request = null;
+        Response<StopActivityStreamResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new StopActivityStreamRequestMarshaller().marshall(super.beforeMarshalling(stopActivityStreamRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "StopActivityStream");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            StaxResponseHandler<StopActivityStreamResult> responseHandler = new StaxResponseHandler<StopActivityStreamResult>(
+                    new StopActivityStreamResultStaxUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Stops an Amazon Aurora DB cluster. When you stop a DB cluster, Aurora retains the DB cluster's metadata,
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/ActivityStreamMode.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/ActivityStreamMode.java
new file mode 100644
index 000000000000..a2598f51c35e
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/ActivityStreamMode.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014-2019 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.rds.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum ActivityStreamMode {
+
+    Sync("sync"),
+    Async("async");
+
+    private String value;
+
+    private ActivityStreamMode(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return ActivityStreamMode corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static ActivityStreamMode fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (ActivityStreamMode enumEntry : ActivityStreamMode.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/ActivityStreamStatus.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/ActivityStreamStatus.java
new file mode 100644
index 000000000000..71f7d0664f7a
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/ActivityStreamStatus.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rds.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum ActivityStreamStatus {
+
+    Stopped("stopped"),
+    Starting("starting"),
+    Started("started"),
+    Stopping("stopping");
+
+    private String value;
+
+    private ActivityStreamStatus(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return ActivityStreamStatus corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static ActivityStreamStatus fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (ActivityStreamStatus enumEntry : ActivityStreamStatus.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/DBCluster.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/DBCluster.java
index 795861f28ac8..a141a99105ac 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/DBCluster.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/DBCluster.java
@@ -340,6 +340,31 @@ public class DBCluster implements Serializable, Cloneable {
      * </p>
      */
     private Boolean httpEndpointEnabled;
+    /**
+     * <p>
+     * The mode of the database activity stream. Database events such as a change or access generate an activity stream
+     * event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     */
+    private String activityStreamMode;
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     */
+    private String activityStreamStatus;
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     */
+    private String activityStreamKmsKeyId;
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     */
+    private String activityStreamKinesisStreamName;
     /**
      * <p>
      * Specifies whether tags are copied from the DB cluster to snapshots of the DB cluster.
@@ -2773,6 +2798,212 @@ public Boolean isHttpEndpointEnabled() {
         return this.httpEndpointEnabled;
     }
 
+    /**
+     * <p>
+     * The mode of the database activity stream. Database events such as a change or access generate an activity stream
+     * event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @param activityStreamMode
+     *        The mode of the database activity stream. Database events such as a change or access generate an activity
+     *        stream event. The database session can handle these events either synchronously or asynchronously.
+     * @see ActivityStreamMode
+     */
+
+    public void setActivityStreamMode(String activityStreamMode) {
+        this.activityStreamMode = activityStreamMode;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream. Database events such as a change or access generate an activity stream
+     * event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @return The mode of the database activity stream. Database events such as a change or access generate an activity
+     *         stream event. The database session can handle these events either synchronously or asynchronously.
+     * @see ActivityStreamMode
+     */
+
+    public String getActivityStreamMode() {
+        return this.activityStreamMode;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream. Database events such as a change or access generate an activity stream
+     * event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @param activityStreamMode
+     *        The mode of the database activity stream. Database events such as a change or access generate an activity
+     *        stream event. The database session can handle these events either synchronously or asynchronously.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamMode
+     */
+
+    public DBCluster withActivityStreamMode(String activityStreamMode) {
+        setActivityStreamMode(activityStreamMode);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream. Database events such as a change or access generate an activity stream
+     * event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @param activityStreamMode
+     *        The mode of the database activity stream. Database events such as a change or access generate an activity
+     *        stream event. The database session can handle these events either synchronously or asynchronously.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamMode
+     */
+
+    public DBCluster withActivityStreamMode(ActivityStreamMode activityStreamMode) {
+        this.activityStreamMode = activityStreamMode.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamStatus
+     *        The status of the database activity stream.
+     * @see ActivityStreamStatus
+     */
+
+    public void setActivityStreamStatus(String activityStreamStatus) {
+        this.activityStreamStatus = activityStreamStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @return The status of the database activity stream.
+     * @see ActivityStreamStatus
+     */
+
+    public String getActivityStreamStatus() {
+        return this.activityStreamStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamStatus
+     *        The status of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamStatus
+     */
+
+    public DBCluster withActivityStreamStatus(String activityStreamStatus) {
+        setActivityStreamStatus(activityStreamStatus);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamStatus
+     *        The status of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamStatus
+     */
+
+    public DBCluster withActivityStreamStatus(ActivityStreamStatus activityStreamStatus) {
+        this.activityStreamStatus = activityStreamStatus.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamKmsKeyId
+     *        The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     */
+
+    public void setActivityStreamKmsKeyId(String activityStreamKmsKeyId) {
+        this.activityStreamKmsKeyId = activityStreamKmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     * 
+     * @return The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     */
+
+    public String getActivityStreamKmsKeyId() {
+        return this.activityStreamKmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamKmsKeyId
+     *        The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DBCluster withActivityStreamKmsKeyId(String activityStreamKmsKeyId) {
+        setActivityStreamKmsKeyId(activityStreamKmsKeyId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamKinesisStreamName
+     *        The name of the Amazon Kinesis data stream used for the database activity stream.
+     */
+
+    public void setActivityStreamKinesisStreamName(String activityStreamKinesisStreamName) {
+        this.activityStreamKinesisStreamName = activityStreamKinesisStreamName;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     * 
+     * @return The name of the Amazon Kinesis data stream used for the database activity stream.
+     */
+
+    public String getActivityStreamKinesisStreamName() {
+        return this.activityStreamKinesisStreamName;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     * 
+     * @param activityStreamKinesisStreamName
+     *        The name of the Amazon Kinesis data stream used for the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public DBCluster withActivityStreamKinesisStreamName(String activityStreamKinesisStreamName) {
+        setActivityStreamKinesisStreamName(activityStreamKinesisStreamName);
+        return this;
+    }
+
     /**
      * <p>
      * Specifies whether tags are copied from the DB cluster to snapshots of the DB cluster.
@@ -2927,6 +3158,14 @@ public String toString() {
             sb.append("DeletionProtection: ").append(getDeletionProtection()).append(",");
         if (getHttpEndpointEnabled() != null)
             sb.append("HttpEndpointEnabled: ").append(getHttpEndpointEnabled()).append(",");
+        if (getActivityStreamMode() != null)
+            sb.append("ActivityStreamMode: ").append(getActivityStreamMode()).append(",");
+        if (getActivityStreamStatus() != null)
+            sb.append("ActivityStreamStatus: ").append(getActivityStreamStatus()).append(",");
+        if (getActivityStreamKmsKeyId() != null)
+            sb.append("ActivityStreamKmsKeyId: ").append(getActivityStreamKmsKeyId()).append(",");
+        if (getActivityStreamKinesisStreamName() != null)
+            sb.append("ActivityStreamKinesisStreamName: ").append(getActivityStreamKinesisStreamName()).append(",");
         if (getCopyTagsToSnapshot() != null)
             sb.append("CopyTagsToSnapshot: ").append(getCopyTagsToSnapshot());
         sb.append("}");
@@ -3126,6 +3365,23 @@ public boolean equals(Object obj) {
             return false;
         if (other.getHttpEndpointEnabled() != null && other.getHttpEndpointEnabled().equals(this.getHttpEndpointEnabled()) == false)
             return false;
+        if (other.getActivityStreamMode() == null ^ this.getActivityStreamMode() == null)
+            return false;
+        if (other.getActivityStreamMode() != null && other.getActivityStreamMode().equals(this.getActivityStreamMode()) == false)
+            return false;
+        if (other.getActivityStreamStatus() == null ^ this.getActivityStreamStatus() == null)
+            return false;
+        if (other.getActivityStreamStatus() != null && other.getActivityStreamStatus().equals(this.getActivityStreamStatus()) == false)
+            return false;
+        if (other.getActivityStreamKmsKeyId() == null ^ this.getActivityStreamKmsKeyId() == null)
+            return false;
+        if (other.getActivityStreamKmsKeyId() != null && other.getActivityStreamKmsKeyId().equals(this.getActivityStreamKmsKeyId()) == false)
+            return false;
+        if (other.getActivityStreamKinesisStreamName() == null ^ this.getActivityStreamKinesisStreamName() == null)
+            return false;
+        if (other.getActivityStreamKinesisStreamName() != null
+                && other.getActivityStreamKinesisStreamName().equals(this.getActivityStreamKinesisStreamName()) == false)
+            return false;
         if (other.getCopyTagsToSnapshot() == null ^ this.getCopyTagsToSnapshot() == null)
             return false;
         if (other.getCopyTagsToSnapshot() != null && other.getCopyTagsToSnapshot().equals(this.getCopyTagsToSnapshot()) == false)
@@ -3183,6 +3439,10 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getScalingConfigurationInfo() == null) ? 0 : getScalingConfigurationInfo().hashCode());
         hashCode = prime * hashCode + ((getDeletionProtection() == null) ? 0 : getDeletionProtection().hashCode());
         hashCode = prime * hashCode + ((getHttpEndpointEnabled() == null) ? 0 : getHttpEndpointEnabled().hashCode());
+        hashCode = prime * hashCode + ((getActivityStreamMode() == null) ? 0 : getActivityStreamMode().hashCode());
+        hashCode = prime * hashCode + ((getActivityStreamStatus() == null) ? 0 : getActivityStreamStatus().hashCode());
+        hashCode = prime * hashCode + ((getActivityStreamKmsKeyId() == null) ? 0 : getActivityStreamKmsKeyId().hashCode());
+        hashCode = prime * hashCode + ((getActivityStreamKinesisStreamName() == null) ? 0 : getActivityStreamKinesisStreamName().hashCode());
         hashCode = prime * hashCode + ((getCopyTagsToSnapshot() == null) ? 0 : getCopyTagsToSnapshot().hashCode());
         return hashCode;
     }
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StartActivityStreamRequest.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StartActivityStreamRequest.java
new file mode 100644
index 000000000000..dfc0e16221d3
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StartActivityStreamRequest.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2014-2019 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.rds.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStream" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StartActivityStreamRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster, for example
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     * activity stream event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     */
+    private String mode;
+    /**
+     * <p>
+     * The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be
+     * either a key ID, a key ARN, or a key alias.
+     * </p>
+     */
+    private String kmsKeyId;
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     */
+    private Boolean applyImmediately;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster, for example
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the DB cluster, for example
+     *        <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster, for example
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the DB cluster, for example
+     *         <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster, for example
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the DB cluster, for example
+     *        <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StartActivityStreamRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     * activity stream event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @param mode
+     *        Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     *        activity stream event. The database session can handle these events either synchronously or
+     *        asynchronously.
+     * @see ActivityStreamMode
+     */
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    /**
+     * <p>
+     * Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     * activity stream event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @return Specifies the mode of the database activity stream. Database events such as a change or access generate
+     *         an activity stream event. The database session can handle these events either synchronously or
+     *         asynchronously.
+     * @see ActivityStreamMode
+     */
+
+    public String getMode() {
+        return this.mode;
+    }
+
+    /**
+     * <p>
+     * Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     * activity stream event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @param mode
+     *        Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     *        activity stream event. The database session can handle these events either synchronously or
+     *        asynchronously.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamMode
+     */
+
+    public StartActivityStreamRequest withMode(String mode) {
+        setMode(mode);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     * activity stream event. The database session can handle these events either synchronously or asynchronously.
+     * </p>
+     * 
+     * @param mode
+     *        Specifies the mode of the database activity stream. Database events such as a change or access generate an
+     *        activity stream event. The database session can handle these events either synchronously or
+     *        asynchronously.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamMode
+     */
+
+    public StartActivityStreamRequest withMode(ActivityStreamMode mode) {
+        this.mode = mode.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be
+     * either a key ID, a key ARN, or a key alias.
+     * </p>
+     * 
+     * @param kmsKeyId
+     *        The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can
+     *        be either a key ID, a key ARN, or a key alias.
+     */
+
+    public void setKmsKeyId(String kmsKeyId) {
+        this.kmsKeyId = kmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be
+     * either a key ID, a key ARN, or a key alias.
+     * </p>
+     * 
+     * @return The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier
+     *         can be either a key ID, a key ARN, or a key alias.
+     */
+
+    public String getKmsKeyId() {
+        return this.kmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can be
+     * either a key ID, a key ARN, or a key alias.
+     * </p>
+     * 
+     * @param kmsKeyId
+     *        The AWS KMS key identifier for encrypting messages in the database activity stream. The key identifier can
+     *        be either a key ID, a key ARN, or a key alias.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StartActivityStreamRequest withKmsKeyId(String kmsKeyId) {
+        setKmsKeyId(kmsKeyId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @param applyImmediately
+     *        Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     *        maintenance window for the database.
+     */
+
+    public void setApplyImmediately(Boolean applyImmediately) {
+        this.applyImmediately = applyImmediately;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @return Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     *         maintenance window for the database.
+     */
+
+    public Boolean getApplyImmediately() {
+        return this.applyImmediately;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @param applyImmediately
+     *        Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     *        maintenance window for the database.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StartActivityStreamRequest withApplyImmediately(Boolean applyImmediately) {
+        setApplyImmediately(applyImmediately);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @return Specifies whether or not the database activity stream is to start as soon as possible, regardless of the
+     *         maintenance window for the database.
+     */
+
+    public Boolean isApplyImmediately() {
+        return this.applyImmediately;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getMode() != null)
+            sb.append("Mode: ").append(getMode()).append(",");
+        if (getKmsKeyId() != null)
+            sb.append("KmsKeyId: ").append(getKmsKeyId()).append(",");
+        if (getApplyImmediately() != null)
+            sb.append("ApplyImmediately: ").append(getApplyImmediately());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof StartActivityStreamRequest == false)
+            return false;
+        StartActivityStreamRequest other = (StartActivityStreamRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getMode() == null ^ this.getMode() == null)
+            return false;
+        if (other.getMode() != null && other.getMode().equals(this.getMode()) == false)
+            return false;
+        if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null)
+            return false;
+        if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false)
+            return false;
+        if (other.getApplyImmediately() == null ^ this.getApplyImmediately() == null)
+            return false;
+        if (other.getApplyImmediately() != null && other.getApplyImmediately().equals(this.getApplyImmediately()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getMode() == null) ? 0 : getMode().hashCode());
+        hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode());
+        hashCode = prime * hashCode + ((getApplyImmediately() == null) ? 0 : getApplyImmediately().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public StartActivityStreamRequest clone() {
+        return (StartActivityStreamRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StartActivityStreamResult.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StartActivityStreamResult.java
new file mode 100644
index 000000000000..412a188cf0dd
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StartActivityStreamResult.java
@@ -0,0 +1,397 @@
+/*
+ * Copyright 2014-2019 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.rds.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStream" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StartActivityStreamResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encryption of messages in the database activity stream.
+     * </p>
+     */
+    private String kmsKeyId;
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     * </p>
+     */
+    private String kinesisStreamName;
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     */
+    private String status;
+    /**
+     * <p>
+     * The mode of the database activity stream.
+     * </p>
+     */
+    private String mode;
+    /**
+     * <p>
+     * Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     */
+    private Boolean applyImmediately;
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encryption of messages in the database activity stream.
+     * </p>
+     * 
+     * @param kmsKeyId
+     *        The AWS KMS key identifier for encryption of messages in the database activity stream.
+     */
+
+    public void setKmsKeyId(String kmsKeyId) {
+        this.kmsKeyId = kmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encryption of messages in the database activity stream.
+     * </p>
+     * 
+     * @return The AWS KMS key identifier for encryption of messages in the database activity stream.
+     */
+
+    public String getKmsKeyId() {
+        return this.kmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier for encryption of messages in the database activity stream.
+     * </p>
+     * 
+     * @param kmsKeyId
+     *        The AWS KMS key identifier for encryption of messages in the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StartActivityStreamResult withKmsKeyId(String kmsKeyId) {
+        setKmsKeyId(kmsKeyId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     * </p>
+     * 
+     * @param kinesisStreamName
+     *        The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     */
+
+    public void setKinesisStreamName(String kinesisStreamName) {
+        this.kinesisStreamName = kinesisStreamName;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     * </p>
+     * 
+     * @return The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     */
+
+    public String getKinesisStreamName() {
+        return this.kinesisStreamName;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     * </p>
+     * 
+     * @param kinesisStreamName
+     *        The name of the Amazon Kinesis data stream to be used for the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StartActivityStreamResult withKinesisStreamName(String kinesisStreamName) {
+        setKinesisStreamName(kinesisStreamName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param status
+     *        The status of the database activity stream.
+     * @see ActivityStreamStatus
+     */
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @return The status of the database activity stream.
+     * @see ActivityStreamStatus
+     */
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param status
+     *        The status of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamStatus
+     */
+
+    public StartActivityStreamResult withStatus(String status) {
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param status
+     *        The status of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamStatus
+     */
+
+    public StartActivityStreamResult withStatus(ActivityStreamStatus status) {
+        this.status = status.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream.
+     * </p>
+     * 
+     * @param mode
+     *        The mode of the database activity stream.
+     * @see ActivityStreamMode
+     */
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream.
+     * </p>
+     * 
+     * @return The mode of the database activity stream.
+     * @see ActivityStreamMode
+     */
+
+    public String getMode() {
+        return this.mode;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream.
+     * </p>
+     * 
+     * @param mode
+     *        The mode of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamMode
+     */
+
+    public StartActivityStreamResult withMode(String mode) {
+        setMode(mode);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The mode of the database activity stream.
+     * </p>
+     * 
+     * @param mode
+     *        The mode of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamMode
+     */
+
+    public StartActivityStreamResult withMode(ActivityStreamMode mode) {
+        this.mode = mode.toString();
+        return this;
+    }
+
+    /**
+     * <p>
+     * Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @param applyImmediately
+     *        Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     *        maintenance window for the database.
+     */
+
+    public void setApplyImmediately(Boolean applyImmediately) {
+        this.applyImmediately = applyImmediately;
+    }
+
+    /**
+     * <p>
+     * Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @return Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     *         maintenance window for the database.
+     */
+
+    public Boolean getApplyImmediately() {
+        return this.applyImmediately;
+    }
+
+    /**
+     * <p>
+     * Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @param applyImmediately
+     *        Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     *        maintenance window for the database.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StartActivityStreamResult withApplyImmediately(Boolean applyImmediately) {
+        setApplyImmediately(applyImmediately);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @return Indicates whether or not the database activity stream will start as soon as possible, regardless of the
+     *         maintenance window for the database.
+     */
+
+    public Boolean isApplyImmediately() {
+        return this.applyImmediately;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getKmsKeyId() != null)
+            sb.append("KmsKeyId: ").append(getKmsKeyId()).append(",");
+        if (getKinesisStreamName() != null)
+            sb.append("KinesisStreamName: ").append(getKinesisStreamName()).append(",");
+        if (getStatus() != null)
+            sb.append("Status: ").append(getStatus()).append(",");
+        if (getMode() != null)
+            sb.append("Mode: ").append(getMode()).append(",");
+        if (getApplyImmediately() != null)
+            sb.append("ApplyImmediately: ").append(getApplyImmediately());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof StartActivityStreamResult == false)
+            return false;
+        StartActivityStreamResult other = (StartActivityStreamResult) obj;
+        if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null)
+            return false;
+        if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false)
+            return false;
+        if (other.getKinesisStreamName() == null ^ this.getKinesisStreamName() == null)
+            return false;
+        if (other.getKinesisStreamName() != null && other.getKinesisStreamName().equals(this.getKinesisStreamName()) == false)
+            return false;
+        if (other.getStatus() == null ^ this.getStatus() == null)
+            return false;
+        if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
+            return false;
+        if (other.getMode() == null ^ this.getMode() == null)
+            return false;
+        if (other.getMode() != null && other.getMode().equals(this.getMode()) == false)
+            return false;
+        if (other.getApplyImmediately() == null ^ this.getApplyImmediately() == null)
+            return false;
+        if (other.getApplyImmediately() != null && other.getApplyImmediately().equals(this.getApplyImmediately()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode());
+        hashCode = prime * hashCode + ((getKinesisStreamName() == null) ? 0 : getKinesisStreamName().hashCode());
+        hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        hashCode = prime * hashCode + ((getMode() == null) ? 0 : getMode().hashCode());
+        hashCode = prime * hashCode + ((getApplyImmediately() == null) ? 0 : getApplyImmediately().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public StartActivityStreamResult clone() {
+        try {
+            return (StartActivityStreamResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StopActivityStreamRequest.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StopActivityStreamRequest.java
new file mode 100644
index 000000000000..7936001524bf
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StopActivityStreamRequest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2014-2019 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.rds.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StopActivityStream" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StopActivityStreamRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     */
+    private Boolean applyImmediately;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     *        <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     *         <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     * <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the DB cluster for the database activity stream. For example,
+     *        <code>arn:aws:rds:us-east-1:12345667890:cluster:das-cluster</code>.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StopActivityStreamRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @param applyImmediately
+     *        Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     *        maintenance window for the database.
+     */
+
+    public void setApplyImmediately(Boolean applyImmediately) {
+        this.applyImmediately = applyImmediately;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @return Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     *         maintenance window for the database.
+     */
+
+    public Boolean getApplyImmediately() {
+        return this.applyImmediately;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @param applyImmediately
+     *        Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     *        maintenance window for the database.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StopActivityStreamRequest withApplyImmediately(Boolean applyImmediately) {
+        setApplyImmediately(applyImmediately);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     * maintenance window for the database.
+     * </p>
+     * 
+     * @return Specifies whether or not the database activity stream is to stop as soon as possible, regardless of the
+     *         maintenance window for the database.
+     */
+
+    public Boolean isApplyImmediately() {
+        return this.applyImmediately;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getApplyImmediately() != null)
+            sb.append("ApplyImmediately: ").append(getApplyImmediately());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof StopActivityStreamRequest == false)
+            return false;
+        StopActivityStreamRequest other = (StopActivityStreamRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getApplyImmediately() == null ^ this.getApplyImmediately() == null)
+            return false;
+        if (other.getApplyImmediately() != null && other.getApplyImmediately().equals(this.getApplyImmediately()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getApplyImmediately() == null) ? 0 : getApplyImmediately().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public StopActivityStreamRequest clone() {
+        return (StopActivityStreamRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StopActivityStreamResult.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StopActivityStreamResult.java
new file mode 100644
index 000000000000..5ab6f18ccde3
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/StopActivityStreamResult.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2014-2019 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.rds.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StopActivityStream" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StopActivityStreamResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     */
+    private String kmsKeyId;
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     */
+    private String kinesisStreamName;
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     */
+    private String status;
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     * 
+     * @param kmsKeyId
+     *        The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     */
+
+    public void setKmsKeyId(String kmsKeyId) {
+        this.kmsKeyId = kmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     * 
+     * @return The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     */
+
+    public String getKmsKeyId() {
+        return this.kmsKeyId;
+    }
+
+    /**
+     * <p>
+     * The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * </p>
+     * 
+     * @param kmsKeyId
+     *        The AWS KMS key identifier used for encrypting messages in the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StopActivityStreamResult withKmsKeyId(String kmsKeyId) {
+        setKmsKeyId(kmsKeyId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     * 
+     * @param kinesisStreamName
+     *        The name of the Amazon Kinesis data stream used for the database activity stream.
+     */
+
+    public void setKinesisStreamName(String kinesisStreamName) {
+        this.kinesisStreamName = kinesisStreamName;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     * 
+     * @return The name of the Amazon Kinesis data stream used for the database activity stream.
+     */
+
+    public String getKinesisStreamName() {
+        return this.kinesisStreamName;
+    }
+
+    /**
+     * <p>
+     * The name of the Amazon Kinesis data stream used for the database activity stream.
+     * </p>
+     * 
+     * @param kinesisStreamName
+     *        The name of the Amazon Kinesis data stream used for the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StopActivityStreamResult withKinesisStreamName(String kinesisStreamName) {
+        setKinesisStreamName(kinesisStreamName);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param status
+     *        The status of the database activity stream.
+     * @see ActivityStreamStatus
+     */
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @return The status of the database activity stream.
+     * @see ActivityStreamStatus
+     */
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param status
+     *        The status of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamStatus
+     */
+
+    public StopActivityStreamResult withStatus(String status) {
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the database activity stream.
+     * </p>
+     * 
+     * @param status
+     *        The status of the database activity stream.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see ActivityStreamStatus
+     */
+
+    public StopActivityStreamResult withStatus(ActivityStreamStatus status) {
+        this.status = status.toString();
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getKmsKeyId() != null)
+            sb.append("KmsKeyId: ").append(getKmsKeyId()).append(",");
+        if (getKinesisStreamName() != null)
+            sb.append("KinesisStreamName: ").append(getKinesisStreamName()).append(",");
+        if (getStatus() != null)
+            sb.append("Status: ").append(getStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof StopActivityStreamResult == false)
+            return false;
+        StopActivityStreamResult other = (StopActivityStreamResult) obj;
+        if (other.getKmsKeyId() == null ^ this.getKmsKeyId() == null)
+            return false;
+        if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false)
+            return false;
+        if (other.getKinesisStreamName() == null ^ this.getKinesisStreamName() == null)
+            return false;
+        if (other.getKinesisStreamName() != null && other.getKinesisStreamName().equals(this.getKinesisStreamName()) == false)
+            return false;
+        if (other.getStatus() == null ^ this.getStatus() == null)
+            return false;
+        if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode());
+        hashCode = prime * hashCode + ((getKinesisStreamName() == null) ? 0 : getKinesisStreamName().hashCode());
+        hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public StopActivityStreamResult clone() {
+        try {
+            return (StopActivityStreamResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/DBClusterStaxUnmarshaller.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/DBClusterStaxUnmarshaller.java
index 9f1182461dbf..759f2d233f03 100644
--- a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/DBClusterStaxUnmarshaller.java
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/DBClusterStaxUnmarshaller.java
@@ -310,6 +310,26 @@ public DBCluster unmarshall(StaxUnmarshallerContext context) throws Exception {
                     continue;
                 }
 
+                if (context.testExpression("ActivityStreamMode", targetDepth)) {
+                    dBCluster.setActivityStreamMode(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("ActivityStreamStatus", targetDepth)) {
+                    dBCluster.setActivityStreamStatus(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("ActivityStreamKmsKeyId", targetDepth)) {
+                    dBCluster.setActivityStreamKmsKeyId(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("ActivityStreamKinesisStreamName", targetDepth)) {
+                    dBCluster.setActivityStreamKinesisStreamName(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
                 if (context.testExpression("CopyTagsToSnapshot", targetDepth)) {
                     dBCluster.setCopyTagsToSnapshot(BooleanStaxUnmarshaller.getInstance().unmarshall(context));
                     continue;
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StartActivityStreamRequestMarshaller.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StartActivityStreamRequestMarshaller.java
new file mode 100644
index 000000000000..08950c646ab3
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StartActivityStreamRequestMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rds.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+import com.amazonaws.DefaultRequest;
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rds.model.*;
+import com.amazonaws.transform.Marshaller;
+import com.amazonaws.util.StringUtils;
+
+/**
+ * StartActivityStreamRequest Marshaller
+ */
+
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StartActivityStreamRequestMarshaller implements Marshaller<Request<StartActivityStreamRequest>, StartActivityStreamRequest> {
+
+    public Request<StartActivityStreamRequest> marshall(StartActivityStreamRequest startActivityStreamRequest) {
+
+        if (startActivityStreamRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        Request<StartActivityStreamRequest> request = new DefaultRequest<StartActivityStreamRequest>(startActivityStreamRequest, "AmazonRDS");
+        request.addParameter("Action", "StartActivityStream");
+        request.addParameter("Version", "2014-10-31");
+        request.setHttpMethod(HttpMethodName.POST);
+
+        if (startActivityStreamRequest.getResourceArn() != null) {
+            request.addParameter("ResourceArn", StringUtils.fromString(startActivityStreamRequest.getResourceArn()));
+        }
+
+        if (startActivityStreamRequest.getMode() != null) {
+            request.addParameter("Mode", StringUtils.fromString(startActivityStreamRequest.getMode()));
+        }
+
+        if (startActivityStreamRequest.getKmsKeyId() != null) {
+            request.addParameter("KmsKeyId", StringUtils.fromString(startActivityStreamRequest.getKmsKeyId()));
+        }
+
+        if (startActivityStreamRequest.getApplyImmediately() != null) {
+            request.addParameter("ApplyImmediately", StringUtils.fromBoolean(startActivityStreamRequest.getApplyImmediately()));
+        }
+
+        return request;
+    }
+
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StartActivityStreamResultStaxUnmarshaller.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StartActivityStreamResultStaxUnmarshaller.java
new file mode 100644
index 000000000000..97f7819fe593
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StartActivityStreamResultStaxUnmarshaller.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2014-2019 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.rds.model.transform;
+
+import javax.xml.stream.events.XMLEvent;
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rds.model.*;
+import com.amazonaws.transform.Unmarshaller;
+
+import com.amazonaws.transform.StaxUnmarshallerContext;
+import com.amazonaws.transform.SimpleTypeStaxUnmarshallers.*;
+
+/**
+ * StartActivityStreamResult StAX Unmarshaller
+ */
+
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StartActivityStreamResultStaxUnmarshaller implements Unmarshaller<StartActivityStreamResult, StaxUnmarshallerContext> {
+
+    public StartActivityStreamResult unmarshall(StaxUnmarshallerContext context) throws Exception {
+        StartActivityStreamResult startActivityStreamResult = new StartActivityStreamResult();
+        int originalDepth = context.getCurrentDepth();
+        int targetDepth = originalDepth + 1;
+
+        if (context.isStartOfDocument())
+            targetDepth += 2;
+
+        while (true) {
+            XMLEvent xmlEvent = context.nextEvent();
+            if (xmlEvent.isEndDocument())
+                return startActivityStreamResult;
+
+            if (xmlEvent.isAttribute() || xmlEvent.isStartElement()) {
+
+                if (context.testExpression("KmsKeyId", targetDepth)) {
+                    startActivityStreamResult.setKmsKeyId(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("KinesisStreamName", targetDepth)) {
+                    startActivityStreamResult.setKinesisStreamName(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("Status", targetDepth)) {
+                    startActivityStreamResult.setStatus(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("Mode", targetDepth)) {
+                    startActivityStreamResult.setMode(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("ApplyImmediately", targetDepth)) {
+                    startActivityStreamResult.setApplyImmediately(BooleanStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+            } else if (xmlEvent.isEndElement()) {
+                if (context.getCurrentDepth() < originalDepth) {
+                    return startActivityStreamResult;
+                }
+            }
+        }
+    }
+
+    private static StartActivityStreamResultStaxUnmarshaller instance;
+
+    public static StartActivityStreamResultStaxUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new StartActivityStreamResultStaxUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StopActivityStreamRequestMarshaller.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StopActivityStreamRequestMarshaller.java
new file mode 100644
index 000000000000..636f2093592b
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StopActivityStreamRequestMarshaller.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014-2019 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.rds.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+import com.amazonaws.DefaultRequest;
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rds.model.*;
+import com.amazonaws.transform.Marshaller;
+import com.amazonaws.util.StringUtils;
+
+/**
+ * StopActivityStreamRequest Marshaller
+ */
+
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StopActivityStreamRequestMarshaller implements Marshaller<Request<StopActivityStreamRequest>, StopActivityStreamRequest> {
+
+    public Request<StopActivityStreamRequest> marshall(StopActivityStreamRequest stopActivityStreamRequest) {
+
+        if (stopActivityStreamRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        Request<StopActivityStreamRequest> request = new DefaultRequest<StopActivityStreamRequest>(stopActivityStreamRequest, "AmazonRDS");
+        request.addParameter("Action", "StopActivityStream");
+        request.addParameter("Version", "2014-10-31");
+        request.setHttpMethod(HttpMethodName.POST);
+
+        if (stopActivityStreamRequest.getResourceArn() != null) {
+            request.addParameter("ResourceArn", StringUtils.fromString(stopActivityStreamRequest.getResourceArn()));
+        }
+
+        if (stopActivityStreamRequest.getApplyImmediately() != null) {
+            request.addParameter("ApplyImmediately", StringUtils.fromBoolean(stopActivityStreamRequest.getApplyImmediately()));
+        }
+
+        return request;
+    }
+
+}
diff --git a/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StopActivityStreamResultStaxUnmarshaller.java b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StopActivityStreamResultStaxUnmarshaller.java
new file mode 100644
index 000000000000..fbab8978959a
--- /dev/null
+++ b/aws-java-sdk-rds/src/main/java/com/amazonaws/services/rds/model/transform/StopActivityStreamResultStaxUnmarshaller.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014-2019 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.rds.model.transform;
+
+import javax.xml.stream.events.XMLEvent;
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rds.model.*;
+import com.amazonaws.transform.Unmarshaller;
+
+import com.amazonaws.transform.StaxUnmarshallerContext;
+import com.amazonaws.transform.SimpleTypeStaxUnmarshallers.*;
+
+/**
+ * StopActivityStreamResult StAX Unmarshaller
+ */
+
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StopActivityStreamResultStaxUnmarshaller implements Unmarshaller<StopActivityStreamResult, StaxUnmarshallerContext> {
+
+    public StopActivityStreamResult unmarshall(StaxUnmarshallerContext context) throws Exception {
+        StopActivityStreamResult stopActivityStreamResult = new StopActivityStreamResult();
+        int originalDepth = context.getCurrentDepth();
+        int targetDepth = originalDepth + 1;
+
+        if (context.isStartOfDocument())
+            targetDepth += 2;
+
+        while (true) {
+            XMLEvent xmlEvent = context.nextEvent();
+            if (xmlEvent.isEndDocument())
+                return stopActivityStreamResult;
+
+            if (xmlEvent.isAttribute() || xmlEvent.isStartElement()) {
+
+                if (context.testExpression("KmsKeyId", targetDepth)) {
+                    stopActivityStreamResult.setKmsKeyId(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("KinesisStreamName", targetDepth)) {
+                    stopActivityStreamResult.setKinesisStreamName(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+
+                if (context.testExpression("Status", targetDepth)) {
+                    stopActivityStreamResult.setStatus(StringStaxUnmarshaller.getInstance().unmarshall(context));
+                    continue;
+                }
+            } else if (xmlEvent.isEndElement()) {
+                if (context.getCurrentDepth() < originalDepth) {
+                    return stopActivityStreamResult;
+                }
+            }
+        }
+    }
+
+    private static StopActivityStreamResultStaxUnmarshaller instance;
+
+    public static StopActivityStreamResultStaxUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new StopActivityStreamResultStaxUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/pom.xml b/aws-java-sdk-rdsdata/pom.xml
index a7ec66d5451d..3b3c54ff88e4 100644
--- a/aws-java-sdk-rdsdata/pom.xml
+++ b/aws-java-sdk-rdsdata/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-rdsdata</artifactId>
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSData.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSData.java
index 4a2e2eb6bac6..1fa42958feb3 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSData.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSData.java
@@ -26,7 +26,16 @@
  * {@link com.amazonaws.services.rdsdata.AbstractAWSRDSData} instead.
  * </p>
  * <p>
- * AWS RDS DataService provides Http Endpoint to query RDS databases.
+ * <fullname>Amazon RDS Data Service</fullname>
+ * <p>
+ * Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora Serverless DB cluster. To run these
+ * statements, you work with the Data Service API.
+ * </p>
+ * <p>
+ * For more information about the Data Service API, see <a
+ * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html">Using the Data API for Aurora
+ * Serverless</a> in the <i>Amazon Aurora User Guide</i>.
+ * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public interface AWSRDSData {
@@ -40,25 +49,190 @@ public interface AWSRDSData {
     String ENDPOINT_PREFIX = "rds-data";
 
     /**
-     * Executes any SQL statement on the target database synchronously
+     * <p>
+     * Runs a batch SQL statement over an array of data.
+     * </p>
+     * <p>
+     * You can run bulk update and insert operations for multiple records using a DML statement with different parameter
+     * sets. Bulk operations can provide a significant performance improvement over individual insert and update
+     * operations.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * 
+     * @param batchExecuteStatementRequest
+     *        The request parameters represent the input of a SQL statement over an array of data.
+     * @return Result of the BatchExecuteStatement operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @throws StatementTimeoutException
+     *         The execution of the SQL statement timed out.
+     * @sample AWSRDSData.BatchExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BatchExecuteStatement" target="_top">AWS
+     *      API Documentation</a>
+     */
+    BatchExecuteStatementResult batchExecuteStatement(BatchExecuteStatementRequest batchExecuteStatementRequest);
+
+    /**
+     * <p>
+     * Starts a SQL transaction.
+     * </p>
+     * 
+     * <important>
+     * <p>
+     * A transaction can run for a maximum of 24 hours. A transaction is terminated and rolled back automatically after
+     * 24 hours.
+     * </p>
+     * <p>
+     * A transaction times out if no calls use its transaction ID in three minutes. If a transaction times out before
+     * it's committed, it's rolled back automatically.
+     * </p>
+     * <p>
+     * DDL statements inside a transaction cause an implicit commit. We recommend that you run each DDL statement in a
+     * separate <code>ExecuteStatement</code> call with <code>continueAfterTimeout</code> enabled.
+     * </p>
+     * </important>
+     * 
+     * @param beginTransactionRequest
+     *        The request parameters represent the input of a request to start a SQL transaction.
+     * @return Result of the BeginTransaction operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @throws StatementTimeoutException
+     *         The execution of the SQL statement timed out.
+     * @sample AWSRDSData.BeginTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BeginTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    BeginTransactionResult beginTransaction(BeginTransactionRequest beginTransactionRequest);
+
+    /**
+     * <p>
+     * Ends a SQL transaction started with the <code>BeginTransaction</code> operation and commits the changes.
+     * </p>
+     * 
+     * @param commitTransactionRequest
+     *        The request parameters represent the input of a commit transaction request.
+     * @return Result of the CommitTransaction operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws NotFoundException
+     *         The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @sample AWSRDSData.CommitTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/CommitTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    CommitTransactionResult commitTransaction(CommitTransactionRequest commitTransactionRequest);
+
+    /**
+     * <p>
+     * Runs one or more SQL statements.
+     * </p>
+     * <important>
+     * <p>
+     * This operation is deprecated. Use the <code>BatchExecuteStatement</code> or <code>ExecuteStatement</code>
+     * operation.
+     * </p>
+     * </important>
      * 
      * @param executeSqlRequest
-     *        Execute SQL Request
+     *        The request parameters represent the input of a request to run one or more SQL statements.
      * @return Result of the ExecuteSql operation returned by the service.
      * @throws BadRequestException
-     *         Invalid Request exception
+     *         There is an error in the call or in a SQL statement.
      * @throws ForbiddenException
-     *         Access denied exception
+     *         There are insufficient privileges to make the call.
      * @throws InternalServerErrorException
-     *         Internal service error
+     *         An internal error occurred.
      * @throws ServiceUnavailableErrorException
-     *         Internal service unavailable error
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
      * @sample AWSRDSData.ExecuteSql
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteSql" target="_top">AWS API
      *      Documentation</a>
      */
+    @Deprecated
     ExecuteSqlResult executeSql(ExecuteSqlRequest executeSqlRequest);
 
+    /**
+     * <p>
+     * Runs a SQL statement against a database.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * <p>
+     * The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over
+     * 1,000 records, the call is terminated.
+     * </p>
+     * 
+     * @param executeStatementRequest
+     *        The request parameters represent the input of a request to run a SQL statement against a database.
+     * @return Result of the ExecuteStatement operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @throws StatementTimeoutException
+     *         The execution of the SQL statement timed out.
+     * @sample AWSRDSData.ExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteStatement" target="_top">AWS API
+     *      Documentation</a>
+     */
+    ExecuteStatementResult executeStatement(ExecuteStatementRequest executeStatementRequest);
+
+    /**
+     * <p>
+     * Performs a rollback of a transaction. Rolling back a transaction cancels its changes.
+     * </p>
+     * 
+     * @param rollbackTransactionRequest
+     *        The request parameters represent the input of a request to perform a rollback of a transaction.
+     * @return Result of the RollbackTransaction operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws NotFoundException
+     *         The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @sample AWSRDSData.RollbackTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/RollbackTransaction" target="_top">AWS
+     *      API Documentation</a>
+     */
+    RollbackTransactionResult rollbackTransaction(RollbackTransactionRequest rollbackTransactionRequest);
+
     /**
      * Shuts down this client object, releasing any resources that might be held open. This is an optional method, and
      * callers are not expected to call it, but can if they want to explicitly release any open resources. Once a client
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsync.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsync.java
index 5c9fd3e58158..5c4c83cc8a14 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsync.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsync.java
@@ -25,28 +25,205 @@
  * {@link com.amazonaws.services.rdsdata.AbstractAWSRDSDataAsync} instead.
  * </p>
  * <p>
- * AWS RDS DataService provides Http Endpoint to query RDS databases.
+ * <fullname>Amazon RDS Data Service</fullname>
+ * <p>
+ * Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora Serverless DB cluster. To run these
+ * statements, you work with the Data Service API.
+ * </p>
+ * <p>
+ * For more information about the Data Service API, see <a
+ * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html">Using the Data API for Aurora
+ * Serverless</a> in the <i>Amazon Aurora User Guide</i>.
+ * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public interface AWSRDSDataAsync extends AWSRDSData {
 
     /**
-     * Executes any SQL statement on the target database synchronously
+     * <p>
+     * Runs a batch SQL statement over an array of data.
+     * </p>
+     * <p>
+     * You can run bulk update and insert operations for multiple records using a DML statement with different parameter
+     * sets. Bulk operations can provide a significant performance improvement over individual insert and update
+     * operations.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * 
+     * @param batchExecuteStatementRequest
+     *        The request parameters represent the input of a SQL statement over an array of data.
+     * @return A Java Future containing the result of the BatchExecuteStatement operation returned by the service.
+     * @sample AWSRDSDataAsync.BatchExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BatchExecuteStatement" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<BatchExecuteStatementResult> batchExecuteStatementAsync(BatchExecuteStatementRequest batchExecuteStatementRequest);
+
+    /**
+     * <p>
+     * Runs a batch SQL statement over an array of data.
+     * </p>
+     * <p>
+     * You can run bulk update and insert operations for multiple records using a DML statement with different parameter
+     * sets. Bulk operations can provide a significant performance improvement over individual insert and update
+     * operations.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * 
+     * @param batchExecuteStatementRequest
+     *        The request parameters represent the input of a SQL statement over an array of data.
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the BatchExecuteStatement operation returned by the service.
+     * @sample AWSRDSDataAsyncHandler.BatchExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BatchExecuteStatement" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<BatchExecuteStatementResult> batchExecuteStatementAsync(BatchExecuteStatementRequest batchExecuteStatementRequest,
+            com.amazonaws.handlers.AsyncHandler<BatchExecuteStatementRequest, BatchExecuteStatementResult> asyncHandler);
+
+    /**
+     * <p>
+     * Starts a SQL transaction.
+     * </p>
+     * 
+     * <important>
+     * <p>
+     * A transaction can run for a maximum of 24 hours. A transaction is terminated and rolled back automatically after
+     * 24 hours.
+     * </p>
+     * <p>
+     * A transaction times out if no calls use its transaction ID in three minutes. If a transaction times out before
+     * it's committed, it's rolled back automatically.
+     * </p>
+     * <p>
+     * DDL statements inside a transaction cause an implicit commit. We recommend that you run each DDL statement in a
+     * separate <code>ExecuteStatement</code> call with <code>continueAfterTimeout</code> enabled.
+     * </p>
+     * </important>
+     * 
+     * @param beginTransactionRequest
+     *        The request parameters represent the input of a request to start a SQL transaction.
+     * @return A Java Future containing the result of the BeginTransaction operation returned by the service.
+     * @sample AWSRDSDataAsync.BeginTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BeginTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<BeginTransactionResult> beginTransactionAsync(BeginTransactionRequest beginTransactionRequest);
+
+    /**
+     * <p>
+     * Starts a SQL transaction.
+     * </p>
+     * 
+     * <important>
+     * <p>
+     * A transaction can run for a maximum of 24 hours. A transaction is terminated and rolled back automatically after
+     * 24 hours.
+     * </p>
+     * <p>
+     * A transaction times out if no calls use its transaction ID in three minutes. If a transaction times out before
+     * it's committed, it's rolled back automatically.
+     * </p>
+     * <p>
+     * DDL statements inside a transaction cause an implicit commit. We recommend that you run each DDL statement in a
+     * separate <code>ExecuteStatement</code> call with <code>continueAfterTimeout</code> enabled.
+     * </p>
+     * </important>
+     * 
+     * @param beginTransactionRequest
+     *        The request parameters represent the input of a request to start a SQL transaction.
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the BeginTransaction operation returned by the service.
+     * @sample AWSRDSDataAsyncHandler.BeginTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BeginTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<BeginTransactionResult> beginTransactionAsync(BeginTransactionRequest beginTransactionRequest,
+            com.amazonaws.handlers.AsyncHandler<BeginTransactionRequest, BeginTransactionResult> asyncHandler);
+
+    /**
+     * <p>
+     * Ends a SQL transaction started with the <code>BeginTransaction</code> operation and commits the changes.
+     * </p>
+     * 
+     * @param commitTransactionRequest
+     *        The request parameters represent the input of a commit transaction request.
+     * @return A Java Future containing the result of the CommitTransaction operation returned by the service.
+     * @sample AWSRDSDataAsync.CommitTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/CommitTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<CommitTransactionResult> commitTransactionAsync(CommitTransactionRequest commitTransactionRequest);
+
+    /**
+     * <p>
+     * Ends a SQL transaction started with the <code>BeginTransaction</code> operation and commits the changes.
+     * </p>
+     * 
+     * @param commitTransactionRequest
+     *        The request parameters represent the input of a commit transaction request.
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the CommitTransaction operation returned by the service.
+     * @sample AWSRDSDataAsyncHandler.CommitTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/CommitTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<CommitTransactionResult> commitTransactionAsync(CommitTransactionRequest commitTransactionRequest,
+            com.amazonaws.handlers.AsyncHandler<CommitTransactionRequest, CommitTransactionResult> asyncHandler);
+
+    /**
+     * <p>
+     * Runs one or more SQL statements.
+     * </p>
+     * <important>
+     * <p>
+     * This operation is deprecated. Use the <code>BatchExecuteStatement</code> or <code>ExecuteStatement</code>
+     * operation.
+     * </p>
+     * </important>
      * 
      * @param executeSqlRequest
-     *        Execute SQL Request
+     *        The request parameters represent the input of a request to run one or more SQL statements.
      * @return A Java Future containing the result of the ExecuteSql operation returned by the service.
      * @sample AWSRDSDataAsync.ExecuteSql
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteSql" target="_top">AWS API
      *      Documentation</a>
      */
+    @Deprecated
     java.util.concurrent.Future<ExecuteSqlResult> executeSqlAsync(ExecuteSqlRequest executeSqlRequest);
 
     /**
-     * Executes any SQL statement on the target database synchronously
+     * <p>
+     * Runs one or more SQL statements.
+     * </p>
+     * <important>
+     * <p>
+     * This operation is deprecated. Use the <code>BatchExecuteStatement</code> or <code>ExecuteStatement</code>
+     * operation.
+     * </p>
+     * </important>
      * 
      * @param executeSqlRequest
-     *        Execute SQL Request
+     *        The request parameters represent the input of a request to run one or more SQL statements.
      * @param asyncHandler
      *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
      *        implementation of the callback methods in this interface to receive notification of successful or
@@ -56,7 +233,94 @@ public interface AWSRDSDataAsync extends AWSRDSData {
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteSql" target="_top">AWS API
      *      Documentation</a>
      */
+    @Deprecated
     java.util.concurrent.Future<ExecuteSqlResult> executeSqlAsync(ExecuteSqlRequest executeSqlRequest,
             com.amazonaws.handlers.AsyncHandler<ExecuteSqlRequest, ExecuteSqlResult> asyncHandler);
 
+    /**
+     * <p>
+     * Runs a SQL statement against a database.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * <p>
+     * The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over
+     * 1,000 records, the call is terminated.
+     * </p>
+     * 
+     * @param executeStatementRequest
+     *        The request parameters represent the input of a request to run a SQL statement against a database.
+     * @return A Java Future containing the result of the ExecuteStatement operation returned by the service.
+     * @sample AWSRDSDataAsync.ExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteStatement" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<ExecuteStatementResult> executeStatementAsync(ExecuteStatementRequest executeStatementRequest);
+
+    /**
+     * <p>
+     * Runs a SQL statement against a database.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * <p>
+     * The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over
+     * 1,000 records, the call is terminated.
+     * </p>
+     * 
+     * @param executeStatementRequest
+     *        The request parameters represent the input of a request to run a SQL statement against a database.
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ExecuteStatement operation returned by the service.
+     * @sample AWSRDSDataAsyncHandler.ExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteStatement" target="_top">AWS API
+     *      Documentation</a>
+     */
+    java.util.concurrent.Future<ExecuteStatementResult> executeStatementAsync(ExecuteStatementRequest executeStatementRequest,
+            com.amazonaws.handlers.AsyncHandler<ExecuteStatementRequest, ExecuteStatementResult> asyncHandler);
+
+    /**
+     * <p>
+     * Performs a rollback of a transaction. Rolling back a transaction cancels its changes.
+     * </p>
+     * 
+     * @param rollbackTransactionRequest
+     *        The request parameters represent the input of a request to perform a rollback of a transaction.
+     * @return A Java Future containing the result of the RollbackTransaction operation returned by the service.
+     * @sample AWSRDSDataAsync.RollbackTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/RollbackTransaction" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<RollbackTransactionResult> rollbackTransactionAsync(RollbackTransactionRequest rollbackTransactionRequest);
+
+    /**
+     * <p>
+     * Performs a rollback of a transaction. Rolling back a transaction cancels its changes.
+     * </p>
+     * 
+     * @param rollbackTransactionRequest
+     *        The request parameters represent the input of a request to perform a rollback of a transaction.
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the RollbackTransaction operation returned by the service.
+     * @sample AWSRDSDataAsyncHandler.RollbackTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/RollbackTransaction" target="_top">AWS
+     *      API Documentation</a>
+     */
+    java.util.concurrent.Future<RollbackTransactionResult> rollbackTransactionAsync(RollbackTransactionRequest rollbackTransactionRequest,
+            com.amazonaws.handlers.AsyncHandler<RollbackTransactionRequest, RollbackTransactionResult> asyncHandler);
+
 }
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsyncClient.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsyncClient.java
index 3bb00655d98b..76e052553590 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsyncClient.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataAsyncClient.java
@@ -25,7 +25,16 @@
  * representing the asynchronous operation; overloads which accept an {@code AsyncHandler} can be used to receive
  * notification when an asynchronous operation completes.
  * <p>
- * AWS RDS DataService provides Http Endpoint to query RDS databases.
+ * <fullname>Amazon RDS Data Service</fullname>
+ * <p>
+ * Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora Serverless DB cluster. To run these
+ * statements, you work with the Data Service API.
+ * </p>
+ * <p>
+ * For more information about the Data Service API, see <a
+ * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html">Using the Data API for Aurora
+ * Serverless</a> in the <i>Amazon Aurora User Guide</i>.
+ * </p>
  */
 @ThreadSafe
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
@@ -61,12 +70,113 @@ public ExecutorService getExecutorService() {
     }
 
     @Override
+    public java.util.concurrent.Future<BatchExecuteStatementResult> batchExecuteStatementAsync(BatchExecuteStatementRequest request) {
+
+        return batchExecuteStatementAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchExecuteStatementResult> batchExecuteStatementAsync(final BatchExecuteStatementRequest request,
+            final com.amazonaws.handlers.AsyncHandler<BatchExecuteStatementRequest, BatchExecuteStatementResult> asyncHandler) {
+        final BatchExecuteStatementRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<BatchExecuteStatementResult>() {
+            @Override
+            public BatchExecuteStatementResult call() throws Exception {
+                BatchExecuteStatementResult result = null;
+
+                try {
+                    result = executeBatchExecuteStatement(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<BeginTransactionResult> beginTransactionAsync(BeginTransactionRequest request) {
+
+        return beginTransactionAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BeginTransactionResult> beginTransactionAsync(final BeginTransactionRequest request,
+            final com.amazonaws.handlers.AsyncHandler<BeginTransactionRequest, BeginTransactionResult> asyncHandler) {
+        final BeginTransactionRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<BeginTransactionResult>() {
+            @Override
+            public BeginTransactionResult call() throws Exception {
+                BeginTransactionResult result = null;
+
+                try {
+                    result = executeBeginTransaction(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<CommitTransactionResult> commitTransactionAsync(CommitTransactionRequest request) {
+
+        return commitTransactionAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<CommitTransactionResult> commitTransactionAsync(final CommitTransactionRequest request,
+            final com.amazonaws.handlers.AsyncHandler<CommitTransactionRequest, CommitTransactionResult> asyncHandler) {
+        final CommitTransactionRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<CommitTransactionResult>() {
+            @Override
+            public CommitTransactionResult call() throws Exception {
+                CommitTransactionResult result = null;
+
+                try {
+                    result = executeCommitTransaction(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    @Deprecated
     public java.util.concurrent.Future<ExecuteSqlResult> executeSqlAsync(ExecuteSqlRequest request) {
 
         return executeSqlAsync(request, null);
     }
 
     @Override
+    @Deprecated
     public java.util.concurrent.Future<ExecuteSqlResult> executeSqlAsync(final ExecuteSqlRequest request,
             final com.amazonaws.handlers.AsyncHandler<ExecuteSqlRequest, ExecuteSqlResult> asyncHandler) {
         final ExecuteSqlRequest finalRequest = beforeClientExecution(request);
@@ -93,6 +203,72 @@ public ExecuteSqlResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<ExecuteStatementResult> executeStatementAsync(ExecuteStatementRequest request) {
+
+        return executeStatementAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ExecuteStatementResult> executeStatementAsync(final ExecuteStatementRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ExecuteStatementRequest, ExecuteStatementResult> asyncHandler) {
+        final ExecuteStatementRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ExecuteStatementResult>() {
+            @Override
+            public ExecuteStatementResult call() throws Exception {
+                ExecuteStatementResult result = null;
+
+                try {
+                    result = executeExecuteStatement(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
+    @Override
+    public java.util.concurrent.Future<RollbackTransactionResult> rollbackTransactionAsync(RollbackTransactionRequest request) {
+
+        return rollbackTransactionAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<RollbackTransactionResult> rollbackTransactionAsync(final RollbackTransactionRequest request,
+            final com.amazonaws.handlers.AsyncHandler<RollbackTransactionRequest, RollbackTransactionResult> asyncHandler) {
+        final RollbackTransactionRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<RollbackTransactionResult>() {
+            @Override
+            public RollbackTransactionResult call() throws Exception {
+                RollbackTransactionResult result = null;
+
+                try {
+                    result = executeRollbackTransaction(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     /**
      * Shuts down the client, releasing all managed resources. This includes forcibly terminating all pending
      * asynchronous service calls. Clients who wish to give pending asynchronous service calls time to complete should
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataClient.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataClient.java
index 264f0c14ccfb..cfb343ea1182 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataClient.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AWSRDSDataClient.java
@@ -50,7 +50,16 @@
  * Client for accessing AWS RDS DataService. All service calls made using this client are blocking, and will not return
  * until the service call completes.
  * <p>
- * AWS RDS DataService provides Http Endpoint to query RDS databases.
+ * <fullname>Amazon RDS Data Service</fullname>
+ * <p>
+ * Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora Serverless DB cluster. To run these
+ * statements, you work with the Data Service API.
+ * </p>
+ * <p>
+ * For more information about the Data Service API, see <a
+ * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html">Using the Data API for Aurora
+ * Serverless</a> in the <i>Amazon Aurora User Guide</i>.
+ * </p>
  */
 @ThreadSafe
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
@@ -75,12 +84,18 @@ public class AWSRDSDataClient extends AmazonWebServiceClient implements AWSRDSDa
                     .withSupportsCbor(false)
                     .withSupportsIon(false)
                     .withContentTypeOverride("")
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("NotFoundException").withModeledClass(
+                                    com.amazonaws.services.rdsdata.model.NotFoundException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("ForbiddenException").withModeledClass(
                                     com.amazonaws.services.rdsdata.model.ForbiddenException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("ServiceUnavailableError").withModeledClass(
                                     com.amazonaws.services.rdsdata.model.ServiceUnavailableErrorException.class))
+                    .addErrorMetadata(
+                            new JsonErrorShapeMetadata().withErrorCode("StatementTimeoutException").withModeledClass(
+                                    com.amazonaws.services.rdsdata.model.StatementTimeoutException.class))
                     .addErrorMetadata(
                             new JsonErrorShapeMetadata().withErrorCode("BadRequestException").withModeledClass(
                                     com.amazonaws.services.rdsdata.model.BadRequestException.class))
@@ -136,24 +151,252 @@ private void init() {
     }
 
     /**
-     * Executes any SQL statement on the target database synchronously
+     * <p>
+     * Runs a batch SQL statement over an array of data.
+     * </p>
+     * <p>
+     * You can run bulk update and insert operations for multiple records using a DML statement with different parameter
+     * sets. Bulk operations can provide a significant performance improvement over individual insert and update
+     * operations.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * 
+     * @param batchExecuteStatementRequest
+     *        The request parameters represent the input of a SQL statement over an array of data.
+     * @return Result of the BatchExecuteStatement operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @throws StatementTimeoutException
+     *         The execution of the SQL statement timed out.
+     * @sample AWSRDSData.BatchExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BatchExecuteStatement" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public BatchExecuteStatementResult batchExecuteStatement(BatchExecuteStatementRequest request) {
+        request = beforeClientExecution(request);
+        return executeBatchExecuteStatement(request);
+    }
+
+    @SdkInternalApi
+    final BatchExecuteStatementResult executeBatchExecuteStatement(BatchExecuteStatementRequest batchExecuteStatementRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(batchExecuteStatementRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<BatchExecuteStatementRequest> request = null;
+        Response<BatchExecuteStatementResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new BatchExecuteStatementRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(batchExecuteStatementRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "BatchExecuteStatement");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<BatchExecuteStatementResult>> responseHandler = protocolFactory
+                    .createResponseHandler(new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                            new BatchExecuteStatementResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Starts a SQL transaction.
+     * </p>
+     * 
+     * <important>
+     * <p>
+     * A transaction can run for a maximum of 24 hours. A transaction is terminated and rolled back automatically after
+     * 24 hours.
+     * </p>
+     * <p>
+     * A transaction times out if no calls use its transaction ID in three minutes. If a transaction times out before
+     * it's committed, it's rolled back automatically.
+     * </p>
+     * <p>
+     * DDL statements inside a transaction cause an implicit commit. We recommend that you run each DDL statement in a
+     * separate <code>ExecuteStatement</code> call with <code>continueAfterTimeout</code> enabled.
+     * </p>
+     * </important>
+     * 
+     * @param beginTransactionRequest
+     *        The request parameters represent the input of a request to start a SQL transaction.
+     * @return Result of the BeginTransaction operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @throws StatementTimeoutException
+     *         The execution of the SQL statement timed out.
+     * @sample AWSRDSData.BeginTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BeginTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public BeginTransactionResult beginTransaction(BeginTransactionRequest request) {
+        request = beforeClientExecution(request);
+        return executeBeginTransaction(request);
+    }
+
+    @SdkInternalApi
+    final BeginTransactionResult executeBeginTransaction(BeginTransactionRequest beginTransactionRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(beginTransactionRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<BeginTransactionRequest> request = null;
+        Response<BeginTransactionResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new BeginTransactionRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(beginTransactionRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "BeginTransaction");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<BeginTransactionResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new BeginTransactionResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Ends a SQL transaction started with the <code>BeginTransaction</code> operation and commits the changes.
+     * </p>
+     * 
+     * @param commitTransactionRequest
+     *        The request parameters represent the input of a commit transaction request.
+     * @return Result of the CommitTransaction operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws NotFoundException
+     *         The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @sample AWSRDSData.CommitTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/CommitTransaction" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public CommitTransactionResult commitTransaction(CommitTransactionRequest request) {
+        request = beforeClientExecution(request);
+        return executeCommitTransaction(request);
+    }
+
+    @SdkInternalApi
+    final CommitTransactionResult executeCommitTransaction(CommitTransactionRequest commitTransactionRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(commitTransactionRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<CommitTransactionRequest> request = null;
+        Response<CommitTransactionResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new CommitTransactionRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(commitTransactionRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "CommitTransaction");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<CommitTransactionResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new CommitTransactionResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Runs one or more SQL statements.
+     * </p>
+     * <important>
+     * <p>
+     * This operation is deprecated. Use the <code>BatchExecuteStatement</code> or <code>ExecuteStatement</code>
+     * operation.
+     * </p>
+     * </important>
      * 
      * @param executeSqlRequest
-     *        Execute SQL Request
+     *        The request parameters represent the input of a request to run one or more SQL statements.
      * @return Result of the ExecuteSql operation returned by the service.
      * @throws BadRequestException
-     *         Invalid Request exception
+     *         There is an error in the call or in a SQL statement.
      * @throws ForbiddenException
-     *         Access denied exception
+     *         There are insufficient privileges to make the call.
      * @throws InternalServerErrorException
-     *         Internal service error
+     *         An internal error occurred.
      * @throws ServiceUnavailableErrorException
-     *         Internal service unavailable error
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
      * @sample AWSRDSData.ExecuteSql
      * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteSql" target="_top">AWS API
      *      Documentation</a>
      */
     @Override
+    @Deprecated
     public ExecuteSqlResult executeSql(ExecuteSqlRequest request) {
         request = beforeClientExecution(request);
         return executeExecuteSql(request);
@@ -195,6 +438,144 @@ final ExecuteSqlResult executeExecuteSql(ExecuteSqlRequest executeSqlRequest) {
         }
     }
 
+    /**
+     * <p>
+     * Runs a SQL statement against a database.
+     * </p>
+     * <important>
+     * <p>
+     * If a call isn't part of a transaction because it doesn't include the <code>transactionID</code> parameter,
+     * changes that result from the call are committed automatically.
+     * </p>
+     * </important>
+     * <p>
+     * The response size limit is 1 MB or 1,000 records. If the call returns more than 1 MB of response data or over
+     * 1,000 records, the call is terminated.
+     * </p>
+     * 
+     * @param executeStatementRequest
+     *        The request parameters represent the input of a request to run a SQL statement against a database.
+     * @return Result of the ExecuteStatement operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @throws StatementTimeoutException
+     *         The execution of the SQL statement timed out.
+     * @sample AWSRDSData.ExecuteStatement
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteStatement" target="_top">AWS API
+     *      Documentation</a>
+     */
+    @Override
+    public ExecuteStatementResult executeStatement(ExecuteStatementRequest request) {
+        request = beforeClientExecution(request);
+        return executeExecuteStatement(request);
+    }
+
+    @SdkInternalApi
+    final ExecuteStatementResult executeExecuteStatement(ExecuteStatementRequest executeStatementRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(executeStatementRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ExecuteStatementRequest> request = null;
+        Response<ExecuteStatementResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ExecuteStatementRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(executeStatementRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ExecuteStatement");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ExecuteStatementResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new ExecuteStatementResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
+    /**
+     * <p>
+     * Performs a rollback of a transaction. Rolling back a transaction cancels its changes.
+     * </p>
+     * 
+     * @param rollbackTransactionRequest
+     *        The request parameters represent the input of a request to perform a rollback of a transaction.
+     * @return Result of the RollbackTransaction operation returned by the service.
+     * @throws BadRequestException
+     *         There is an error in the call or in a SQL statement.
+     * @throws ForbiddenException
+     *         There are insufficient privileges to make the call.
+     * @throws InternalServerErrorException
+     *         An internal error occurred.
+     * @throws NotFoundException
+     *         The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.
+     * @throws ServiceUnavailableErrorException
+     *         The service specified by the <code>resourceArn</code> parameter is not available.
+     * @sample AWSRDSData.RollbackTransaction
+     * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/RollbackTransaction" target="_top">AWS
+     *      API Documentation</a>
+     */
+    @Override
+    public RollbackTransactionResult rollbackTransaction(RollbackTransactionRequest request) {
+        request = beforeClientExecution(request);
+        return executeRollbackTransaction(request);
+    }
+
+    @SdkInternalApi
+    final RollbackTransactionResult executeRollbackTransaction(RollbackTransactionRequest rollbackTransactionRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(rollbackTransactionRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<RollbackTransactionRequest> request = null;
+        Response<RollbackTransactionResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new RollbackTransactionRequestProtocolMarshaller(protocolFactory).marshall(super.beforeMarshalling(rollbackTransactionRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "RDS Data");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "RollbackTransaction");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<RollbackTransactionResult>> responseHandler = protocolFactory.createResponseHandler(
+                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false), new RollbackTransactionResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * Returns additional metadata for a previously executed successful, request, typically used for debugging issues
      * where a service isn't acting as expected. This data isn't considered part of the result data returned by an
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSData.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSData.java
index 112042a7413f..f569c7065480 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSData.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSData.java
@@ -28,10 +28,36 @@ protected AbstractAWSRDSData() {
     }
 
     @Override
+    public BatchExecuteStatementResult batchExecuteStatement(BatchExecuteStatementRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public BeginTransactionResult beginTransaction(BeginTransactionRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public CommitTransactionResult commitTransaction(CommitTransactionRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    @Deprecated
     public ExecuteSqlResult executeSql(ExecuteSqlRequest request) {
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public ExecuteStatementResult executeStatement(ExecuteStatementRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public RollbackTransactionResult rollbackTransaction(RollbackTransactionRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public void shutdown() {
         throw new java.lang.UnsupportedOperationException();
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSDataAsync.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSDataAsync.java
index 91eb0274044c..a3e3b6461b96 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSDataAsync.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/AbstractAWSRDSDataAsync.java
@@ -28,16 +28,83 @@ protected AbstractAWSRDSDataAsync() {
     }
 
     @Override
+    public java.util.concurrent.Future<BatchExecuteStatementResult> batchExecuteStatementAsync(BatchExecuteStatementRequest request) {
+
+        return batchExecuteStatementAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BatchExecuteStatementResult> batchExecuteStatementAsync(BatchExecuteStatementRequest request,
+            com.amazonaws.handlers.AsyncHandler<BatchExecuteStatementRequest, BatchExecuteStatementResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<BeginTransactionResult> beginTransactionAsync(BeginTransactionRequest request) {
+
+        return beginTransactionAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<BeginTransactionResult> beginTransactionAsync(BeginTransactionRequest request,
+            com.amazonaws.handlers.AsyncHandler<BeginTransactionRequest, BeginTransactionResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<CommitTransactionResult> commitTransactionAsync(CommitTransactionRequest request) {
+
+        return commitTransactionAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<CommitTransactionResult> commitTransactionAsync(CommitTransactionRequest request,
+            com.amazonaws.handlers.AsyncHandler<CommitTransactionRequest, CommitTransactionResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    @Deprecated
     public java.util.concurrent.Future<ExecuteSqlResult> executeSqlAsync(ExecuteSqlRequest request) {
 
         return executeSqlAsync(request, null);
     }
 
     @Override
+    @Deprecated
     public java.util.concurrent.Future<ExecuteSqlResult> executeSqlAsync(ExecuteSqlRequest request,
             com.amazonaws.handlers.AsyncHandler<ExecuteSqlRequest, ExecuteSqlResult> asyncHandler) {
 
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<ExecuteStatementResult> executeStatementAsync(ExecuteStatementRequest request) {
+
+        return executeStatementAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ExecuteStatementResult> executeStatementAsync(ExecuteStatementRequest request,
+            com.amazonaws.handlers.AsyncHandler<ExecuteStatementRequest, ExecuteStatementResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
+    @Override
+    public java.util.concurrent.Future<RollbackTransactionResult> rollbackTransactionAsync(RollbackTransactionRequest request) {
+
+        return rollbackTransactionAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<RollbackTransactionResult> rollbackTransactionAsync(RollbackTransactionRequest request,
+            com.amazonaws.handlers.AsyncHandler<RollbackTransactionRequest, RollbackTransactionResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
 }
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BadRequestException.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BadRequestException.java
index 7127ebc2eb17..f4c421684424 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BadRequestException.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BadRequestException.java
@@ -15,7 +15,9 @@
 import javax.annotation.Generated;
 
 /**
- * Invalid Request exception
+ * <p>
+ * There is an error in the call or in a SQL statement.
+ * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class BadRequestException extends com.amazonaws.services.rdsdata.model.AWSRDSDataException {
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BatchExecuteStatementRequest.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BatchExecuteStatementRequest.java
new file mode 100644
index 000000000000..51b89e71bf8c
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BatchExecuteStatementRequest.java
@@ -0,0 +1,500 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * <p>
+ * The request parameters represent the input of a SQL statement over an array of data.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BatchExecuteStatement" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchExecuteStatementRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     */
+    private String database;
+    /**
+     * <p>
+     * The parameter set for the batch operation.
+     * </p>
+     */
+    private java.util.List<java.util.List<SqlParameter>> parameterSets;
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     */
+    private String schema;
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     */
+    private String secretArn;
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     */
+    private String sql;
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     */
+    private String transactionId;
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @param database
+     *        The name of the database.
+     */
+
+    public void setDatabase(String database) {
+        this.database = database;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @return The name of the database.
+     */
+
+    public String getDatabase() {
+        return this.database;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @param database
+     *        The name of the database.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withDatabase(String database) {
+        setDatabase(database);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The parameter set for the batch operation.
+     * </p>
+     * 
+     * @return The parameter set for the batch operation.
+     */
+
+    public java.util.List<java.util.List<SqlParameter>> getParameterSets() {
+        return parameterSets;
+    }
+
+    /**
+     * <p>
+     * The parameter set for the batch operation.
+     * </p>
+     * 
+     * @param parameterSets
+     *        The parameter set for the batch operation.
+     */
+
+    public void setParameterSets(java.util.Collection<java.util.List<SqlParameter>> parameterSets) {
+        if (parameterSets == null) {
+            this.parameterSets = null;
+            return;
+        }
+
+        this.parameterSets = new java.util.ArrayList<java.util.List<SqlParameter>>(parameterSets);
+    }
+
+    /**
+     * <p>
+     * The parameter set for the batch operation.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setParameterSets(java.util.Collection)} or {@link #withParameterSets(java.util.Collection)} if you want
+     * to override the existing values.
+     * </p>
+     * 
+     * @param parameterSets
+     *        The parameter set for the batch operation.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withParameterSets(java.util.List<SqlParameter>... parameterSets) {
+        if (this.parameterSets == null) {
+            setParameterSets(new java.util.ArrayList<java.util.List<SqlParameter>>(parameterSets.length));
+        }
+        for (java.util.List<SqlParameter> ele : parameterSets) {
+            this.parameterSets.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The parameter set for the batch operation.
+     * </p>
+     * 
+     * @param parameterSets
+     *        The parameter set for the batch operation.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withParameterSets(java.util.Collection<java.util.List<SqlParameter>> parameterSets) {
+        setParameterSets(parameterSets);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @param schema
+     *        The name of the database schema.
+     */
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @return The name of the database schema.
+     */
+
+    public String getSchema() {
+        return this.schema;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @param schema
+     *        The name of the database schema.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withSchema(String schema) {
+        setSchema(schema);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public void setSecretArn(String secretArn) {
+        this.secretArn = secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @return The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public String getSecretArn() {
+        return this.secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withSecretArn(String secretArn) {
+        setSecretArn(secretArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     * 
+     * @param sql
+     *        The SQL statement to run.
+     */
+
+    public void setSql(String sql) {
+        this.sql = sql;
+    }
+
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     * 
+     * @return The SQL statement to run.
+     */
+
+    public String getSql() {
+        return this.sql;
+    }
+
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     * 
+     * @param sql
+     *        The SQL statement to run.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withSql(String sql) {
+        setSql(sql);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation.
+     *        Specify the transaction ID of the transaction that you want to include the SQL statement in.</p>
+     *        <p>
+     *        If the SQL statement is not part of a transaction, don't set this parameter.
+     */
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     * 
+     * @return The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation.
+     *         Specify the transaction ID of the transaction that you want to include the SQL statement in.</p>
+     *         <p>
+     *         If the SQL statement is not part of a transaction, don't set this parameter.
+     */
+
+    public String getTransactionId() {
+        return this.transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation.
+     *        Specify the transaction ID of the transaction that you want to include the SQL statement in.</p>
+     *        <p>
+     *        If the SQL statement is not part of a transaction, don't set this parameter.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementRequest withTransactionId(String transactionId) {
+        setTransactionId(transactionId);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDatabase() != null)
+            sb.append("Database: ").append(getDatabase()).append(",");
+        if (getParameterSets() != null)
+            sb.append("ParameterSets: ").append(getParameterSets()).append(",");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getSchema() != null)
+            sb.append("Schema: ").append(getSchema()).append(",");
+        if (getSecretArn() != null)
+            sb.append("SecretArn: ").append(getSecretArn()).append(",");
+        if (getSql() != null)
+            sb.append("Sql: ").append(getSql()).append(",");
+        if (getTransactionId() != null)
+            sb.append("TransactionId: ").append(getTransactionId());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchExecuteStatementRequest == false)
+            return false;
+        BatchExecuteStatementRequest other = (BatchExecuteStatementRequest) obj;
+        if (other.getDatabase() == null ^ this.getDatabase() == null)
+            return false;
+        if (other.getDatabase() != null && other.getDatabase().equals(this.getDatabase()) == false)
+            return false;
+        if (other.getParameterSets() == null ^ this.getParameterSets() == null)
+            return false;
+        if (other.getParameterSets() != null && other.getParameterSets().equals(this.getParameterSets()) == false)
+            return false;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getSchema() == null ^ this.getSchema() == null)
+            return false;
+        if (other.getSchema() != null && other.getSchema().equals(this.getSchema()) == false)
+            return false;
+        if (other.getSecretArn() == null ^ this.getSecretArn() == null)
+            return false;
+        if (other.getSecretArn() != null && other.getSecretArn().equals(this.getSecretArn()) == false)
+            return false;
+        if (other.getSql() == null ^ this.getSql() == null)
+            return false;
+        if (other.getSql() != null && other.getSql().equals(this.getSql()) == false)
+            return false;
+        if (other.getTransactionId() == null ^ this.getTransactionId() == null)
+            return false;
+        if (other.getTransactionId() != null && other.getTransactionId().equals(this.getTransactionId()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDatabase() == null) ? 0 : getDatabase().hashCode());
+        hashCode = prime * hashCode + ((getParameterSets() == null) ? 0 : getParameterSets().hashCode());
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getSchema() == null) ? 0 : getSchema().hashCode());
+        hashCode = prime * hashCode + ((getSecretArn() == null) ? 0 : getSecretArn().hashCode());
+        hashCode = prime * hashCode + ((getSql() == null) ? 0 : getSql().hashCode());
+        hashCode = prime * hashCode + ((getTransactionId() == null) ? 0 : getTransactionId().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchExecuteStatementRequest clone() {
+        return (BatchExecuteStatementRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BatchExecuteStatementResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BatchExecuteStatementResult.java
new file mode 100644
index 000000000000..0f43f7ecda77
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BatchExecuteStatementResult.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The response elements represent the output of a SQL statement over an array of data.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BatchExecuteStatement" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchExecuteStatementResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The execution results of each batch entry.
+     * </p>
+     */
+    private java.util.List<UpdateResult> updateResults;
+
+    /**
+     * <p>
+     * The execution results of each batch entry.
+     * </p>
+     * 
+     * @return The execution results of each batch entry.
+     */
+
+    public java.util.List<UpdateResult> getUpdateResults() {
+        return updateResults;
+    }
+
+    /**
+     * <p>
+     * The execution results of each batch entry.
+     * </p>
+     * 
+     * @param updateResults
+     *        The execution results of each batch entry.
+     */
+
+    public void setUpdateResults(java.util.Collection<UpdateResult> updateResults) {
+        if (updateResults == null) {
+            this.updateResults = null;
+            return;
+        }
+
+        this.updateResults = new java.util.ArrayList<UpdateResult>(updateResults);
+    }
+
+    /**
+     * <p>
+     * The execution results of each batch entry.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setUpdateResults(java.util.Collection)} or {@link #withUpdateResults(java.util.Collection)} if you want
+     * to override the existing values.
+     * </p>
+     * 
+     * @param updateResults
+     *        The execution results of each batch entry.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementResult withUpdateResults(UpdateResult... updateResults) {
+        if (this.updateResults == null) {
+            setUpdateResults(new java.util.ArrayList<UpdateResult>(updateResults.length));
+        }
+        for (UpdateResult ele : updateResults) {
+            this.updateResults.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The execution results of each batch entry.
+     * </p>
+     * 
+     * @param updateResults
+     *        The execution results of each batch entry.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BatchExecuteStatementResult withUpdateResults(java.util.Collection<UpdateResult> updateResults) {
+        setUpdateResults(updateResults);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getUpdateResults() != null)
+            sb.append("UpdateResults: ").append(getUpdateResults());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BatchExecuteStatementResult == false)
+            return false;
+        BatchExecuteStatementResult other = (BatchExecuteStatementResult) obj;
+        if (other.getUpdateResults() == null ^ this.getUpdateResults() == null)
+            return false;
+        if (other.getUpdateResults() != null && other.getUpdateResults().equals(this.getUpdateResults()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getUpdateResults() == null) ? 0 : getUpdateResults().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BatchExecuteStatementResult clone() {
+        try {
+            return (BatchExecuteStatementResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BeginTransactionRequest.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BeginTransactionRequest.java
new file mode 100644
index 000000000000..3dea3c0ddd5d
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BeginTransactionRequest.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * <p>
+ * The request parameters represent the input of a request to start a SQL transaction.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BeginTransaction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BeginTransactionRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     */
+    private String database;
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     */
+    private String schema;
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     */
+    private String secretArn;
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @param database
+     *        The name of the database.
+     */
+
+    public void setDatabase(String database) {
+        this.database = database;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @return The name of the database.
+     */
+
+    public String getDatabase() {
+        return this.database;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @param database
+     *        The name of the database.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BeginTransactionRequest withDatabase(String database) {
+        setDatabase(database);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BeginTransactionRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @param schema
+     *        The name of the database schema.
+     */
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @return The name of the database schema.
+     */
+
+    public String getSchema() {
+        return this.schema;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @param schema
+     *        The name of the database schema.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BeginTransactionRequest withSchema(String schema) {
+        setSchema(schema);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public void setSecretArn(String secretArn) {
+        this.secretArn = secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @return The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public String getSecretArn() {
+        return this.secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BeginTransactionRequest withSecretArn(String secretArn) {
+        setSecretArn(secretArn);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getDatabase() != null)
+            sb.append("Database: ").append(getDatabase()).append(",");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getSchema() != null)
+            sb.append("Schema: ").append(getSchema()).append(",");
+        if (getSecretArn() != null)
+            sb.append("SecretArn: ").append(getSecretArn());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BeginTransactionRequest == false)
+            return false;
+        BeginTransactionRequest other = (BeginTransactionRequest) obj;
+        if (other.getDatabase() == null ^ this.getDatabase() == null)
+            return false;
+        if (other.getDatabase() != null && other.getDatabase().equals(this.getDatabase()) == false)
+            return false;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getSchema() == null ^ this.getSchema() == null)
+            return false;
+        if (other.getSchema() != null && other.getSchema().equals(this.getSchema()) == false)
+            return false;
+        if (other.getSecretArn() == null ^ this.getSecretArn() == null)
+            return false;
+        if (other.getSecretArn() != null && other.getSecretArn().equals(this.getSecretArn()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getDatabase() == null) ? 0 : getDatabase().hashCode());
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getSchema() == null) ? 0 : getSchema().hashCode());
+        hashCode = prime * hashCode + ((getSecretArn() == null) ? 0 : getSecretArn().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BeginTransactionRequest clone() {
+        return (BeginTransactionRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BeginTransactionResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BeginTransactionResult.java
new file mode 100644
index 000000000000..dad99edf96ba
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/BeginTransactionResult.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The response elements represent the output of a request to start a SQL transaction.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/BeginTransaction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BeginTransactionResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The transaction ID of the transaction started by the call.
+     * </p>
+     */
+    private String transactionId;
+
+    /**
+     * <p>
+     * The transaction ID of the transaction started by the call.
+     * </p>
+     * 
+     * @param transactionId
+     *        The transaction ID of the transaction started by the call.
+     */
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    /**
+     * <p>
+     * The transaction ID of the transaction started by the call.
+     * </p>
+     * 
+     * @return The transaction ID of the transaction started by the call.
+     */
+
+    public String getTransactionId() {
+        return this.transactionId;
+    }
+
+    /**
+     * <p>
+     * The transaction ID of the transaction started by the call.
+     * </p>
+     * 
+     * @param transactionId
+     *        The transaction ID of the transaction started by the call.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public BeginTransactionResult withTransactionId(String transactionId) {
+        setTransactionId(transactionId);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTransactionId() != null)
+            sb.append("TransactionId: ").append(getTransactionId());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof BeginTransactionResult == false)
+            return false;
+        BeginTransactionResult other = (BeginTransactionResult) obj;
+        if (other.getTransactionId() == null ^ this.getTransactionId() == null)
+            return false;
+        if (other.getTransactionId() != null && other.getTransactionId().equals(this.getTransactionId()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTransactionId() == null) ? 0 : getTransactionId().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public BeginTransactionResult clone() {
+        try {
+            return (BeginTransactionResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ColumnMetadata.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ColumnMetadata.java
index 2fb7813fd0c0..345a2fcd389b 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ColumnMetadata.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ColumnMetadata.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * Column Metadata
+ * <p>
+ * Contains the metadata for a column.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ColumnMetadata" target="_top">AWS API
  *      Documentation</a>
@@ -26,52 +28,98 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ColumnMetadata implements Serializable, Cloneable, StructuredPojo {
 
-    /** Homogenous array base SQL type from java.sql.Types. */
+    /**
+     * <p>
+     * The type of the column.
+     * </p>
+     */
     private Integer arrayBaseColumnType;
-    /** Whether the designated column is automatically numbered */
+    /**
+     * <p>
+     * A value that indicates whether the column increments automatically.
+     * </p>
+     */
     private Boolean isAutoIncrement;
-    /** Whether values in the designated column's case matters */
+    /**
+     * <p>
+     * A value that indicates whether the column is case-sensitive.
+     * </p>
+     */
     private Boolean isCaseSensitive;
-    /** Whether values in the designated column is a cash value */
+    /**
+     * <p>
+     * A value that indicates whether the column contains currency values.
+     * </p>
+     */
     private Boolean isCurrency;
-    /** Whether values in the designated column are signed numbers */
+    /**
+     * <p>
+     * A value that indicates whether an integer column is signed.
+     * </p>
+     */
     private Boolean isSigned;
-    /** Usually specified by the SQL AS. If not specified, return column name. */
+    /**
+     * <p>
+     * The label for the column.
+     * </p>
+     */
     private String label;
-    /** Name of the column. */
+    /**
+     * <p>
+     * The name of the column.
+     * </p>
+     */
     private String name;
     /**
-     * Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1),
-     * columnNullableUnknown (2)
+     * <p>
+     * A value that indicates whether the column is nullable.
+     * </p>
      */
     private Integer nullable;
     /**
-     * Get the designated column's specified column size.For numeric data, this is the maximum precision. For character
-     * data, this is the length in characters. For datetime datatypes, this is the length in characters of the String
-     * representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this
-     * is the length in bytes. For the ROWID datatype, this is the length in bytes. 0 is returned for data types where
-     * the column size is not applicable.
+     * <p>
+     * The precision value of a decimal number column.
+     * </p>
      */
     private Integer precision;
     /**
-     * Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale
-     * is not applicable.
+     * <p>
+     * The scale value of a decimal number column.
+     * </p>
      */
     private Integer scale;
-    /** Designated column's table's schema */
+    /**
+     * <p>
+     * The name of the schema that owns the table that includes the column.
+     * </p>
+     */
     private String schemaName;
-    /** Designated column's table name */
+    /**
+     * <p>
+     * The name of the table that includes the column.
+     * </p>
+     */
     private String tableName;
-    /** SQL type from java.sql.Types. */
+    /**
+     * <p>
+     * The type of the column.
+     * </p>
+     */
     private Integer type;
-    /** Database-specific type name. */
+    /**
+     * <p>
+     * The database-specific data type of the column.
+     * </p>
+     */
     private String typeName;
 
     /**
-     * Homogenous array base SQL type from java.sql.Types.
+     * <p>
+     * The type of the column.
+     * </p>
      * 
      * @param arrayBaseColumnType
-     *        Homogenous array base SQL type from java.sql.Types.
+     *        The type of the column.
      */
 
     public void setArrayBaseColumnType(Integer arrayBaseColumnType) {
@@ -79,9 +127,11 @@ public void setArrayBaseColumnType(Integer arrayBaseColumnType) {
     }
 
     /**
-     * Homogenous array base SQL type from java.sql.Types.
+     * <p>
+     * The type of the column.
+     * </p>
      * 
-     * @return Homogenous array base SQL type from java.sql.Types.
+     * @return The type of the column.
      */
 
     public Integer getArrayBaseColumnType() {
@@ -89,10 +139,12 @@ public Integer getArrayBaseColumnType() {
     }
 
     /**
-     * Homogenous array base SQL type from java.sql.Types.
+     * <p>
+     * The type of the column.
+     * </p>
      * 
      * @param arrayBaseColumnType
-     *        Homogenous array base SQL type from java.sql.Types.
+     *        The type of the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -102,10 +154,12 @@ public ColumnMetadata withArrayBaseColumnType(Integer arrayBaseColumnType) {
     }
 
     /**
-     * Whether the designated column is automatically numbered
+     * <p>
+     * A value that indicates whether the column increments automatically.
+     * </p>
      * 
      * @param isAutoIncrement
-     *        Whether the designated column is automatically numbered
+     *        A value that indicates whether the column increments automatically.
      */
 
     public void setIsAutoIncrement(Boolean isAutoIncrement) {
@@ -113,9 +167,11 @@ public void setIsAutoIncrement(Boolean isAutoIncrement) {
     }
 
     /**
-     * Whether the designated column is automatically numbered
+     * <p>
+     * A value that indicates whether the column increments automatically.
+     * </p>
      * 
-     * @return Whether the designated column is automatically numbered
+     * @return A value that indicates whether the column increments automatically.
      */
 
     public Boolean getIsAutoIncrement() {
@@ -123,10 +179,12 @@ public Boolean getIsAutoIncrement() {
     }
 
     /**
-     * Whether the designated column is automatically numbered
+     * <p>
+     * A value that indicates whether the column increments automatically.
+     * </p>
      * 
      * @param isAutoIncrement
-     *        Whether the designated column is automatically numbered
+     *        A value that indicates whether the column increments automatically.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -136,9 +194,11 @@ public ColumnMetadata withIsAutoIncrement(Boolean isAutoIncrement) {
     }
 
     /**
-     * Whether the designated column is automatically numbered
+     * <p>
+     * A value that indicates whether the column increments automatically.
+     * </p>
      * 
-     * @return Whether the designated column is automatically numbered
+     * @return A value that indicates whether the column increments automatically.
      */
 
     public Boolean isAutoIncrement() {
@@ -146,10 +206,12 @@ public Boolean isAutoIncrement() {
     }
 
     /**
-     * Whether values in the designated column's case matters
+     * <p>
+     * A value that indicates whether the column is case-sensitive.
+     * </p>
      * 
      * @param isCaseSensitive
-     *        Whether values in the designated column's case matters
+     *        A value that indicates whether the column is case-sensitive.
      */
 
     public void setIsCaseSensitive(Boolean isCaseSensitive) {
@@ -157,9 +219,11 @@ public void setIsCaseSensitive(Boolean isCaseSensitive) {
     }
 
     /**
-     * Whether values in the designated column's case matters
+     * <p>
+     * A value that indicates whether the column is case-sensitive.
+     * </p>
      * 
-     * @return Whether values in the designated column's case matters
+     * @return A value that indicates whether the column is case-sensitive.
      */
 
     public Boolean getIsCaseSensitive() {
@@ -167,10 +231,12 @@ public Boolean getIsCaseSensitive() {
     }
 
     /**
-     * Whether values in the designated column's case matters
+     * <p>
+     * A value that indicates whether the column is case-sensitive.
+     * </p>
      * 
      * @param isCaseSensitive
-     *        Whether values in the designated column's case matters
+     *        A value that indicates whether the column is case-sensitive.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -180,9 +246,11 @@ public ColumnMetadata withIsCaseSensitive(Boolean isCaseSensitive) {
     }
 
     /**
-     * Whether values in the designated column's case matters
+     * <p>
+     * A value that indicates whether the column is case-sensitive.
+     * </p>
      * 
-     * @return Whether values in the designated column's case matters
+     * @return A value that indicates whether the column is case-sensitive.
      */
 
     public Boolean isCaseSensitive() {
@@ -190,10 +258,12 @@ public Boolean isCaseSensitive() {
     }
 
     /**
-     * Whether values in the designated column is a cash value
+     * <p>
+     * A value that indicates whether the column contains currency values.
+     * </p>
      * 
      * @param isCurrency
-     *        Whether values in the designated column is a cash value
+     *        A value that indicates whether the column contains currency values.
      */
 
     public void setIsCurrency(Boolean isCurrency) {
@@ -201,9 +271,11 @@ public void setIsCurrency(Boolean isCurrency) {
     }
 
     /**
-     * Whether values in the designated column is a cash value
+     * <p>
+     * A value that indicates whether the column contains currency values.
+     * </p>
      * 
-     * @return Whether values in the designated column is a cash value
+     * @return A value that indicates whether the column contains currency values.
      */
 
     public Boolean getIsCurrency() {
@@ -211,10 +283,12 @@ public Boolean getIsCurrency() {
     }
 
     /**
-     * Whether values in the designated column is a cash value
+     * <p>
+     * A value that indicates whether the column contains currency values.
+     * </p>
      * 
      * @param isCurrency
-     *        Whether values in the designated column is a cash value
+     *        A value that indicates whether the column contains currency values.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -224,9 +298,11 @@ public ColumnMetadata withIsCurrency(Boolean isCurrency) {
     }
 
     /**
-     * Whether values in the designated column is a cash value
+     * <p>
+     * A value that indicates whether the column contains currency values.
+     * </p>
      * 
-     * @return Whether values in the designated column is a cash value
+     * @return A value that indicates whether the column contains currency values.
      */
 
     public Boolean isCurrency() {
@@ -234,10 +310,12 @@ public Boolean isCurrency() {
     }
 
     /**
-     * Whether values in the designated column are signed numbers
+     * <p>
+     * A value that indicates whether an integer column is signed.
+     * </p>
      * 
      * @param isSigned
-     *        Whether values in the designated column are signed numbers
+     *        A value that indicates whether an integer column is signed.
      */
 
     public void setIsSigned(Boolean isSigned) {
@@ -245,9 +323,11 @@ public void setIsSigned(Boolean isSigned) {
     }
 
     /**
-     * Whether values in the designated column are signed numbers
+     * <p>
+     * A value that indicates whether an integer column is signed.
+     * </p>
      * 
-     * @return Whether values in the designated column are signed numbers
+     * @return A value that indicates whether an integer column is signed.
      */
 
     public Boolean getIsSigned() {
@@ -255,10 +335,12 @@ public Boolean getIsSigned() {
     }
 
     /**
-     * Whether values in the designated column are signed numbers
+     * <p>
+     * A value that indicates whether an integer column is signed.
+     * </p>
      * 
      * @param isSigned
-     *        Whether values in the designated column are signed numbers
+     *        A value that indicates whether an integer column is signed.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -268,9 +350,11 @@ public ColumnMetadata withIsSigned(Boolean isSigned) {
     }
 
     /**
-     * Whether values in the designated column are signed numbers
+     * <p>
+     * A value that indicates whether an integer column is signed.
+     * </p>
      * 
-     * @return Whether values in the designated column are signed numbers
+     * @return A value that indicates whether an integer column is signed.
      */
 
     public Boolean isSigned() {
@@ -278,10 +362,12 @@ public Boolean isSigned() {
     }
 
     /**
-     * Usually specified by the SQL AS. If not specified, return column name.
+     * <p>
+     * The label for the column.
+     * </p>
      * 
      * @param label
-     *        Usually specified by the SQL AS. If not specified, return column name.
+     *        The label for the column.
      */
 
     public void setLabel(String label) {
@@ -289,9 +375,11 @@ public void setLabel(String label) {
     }
 
     /**
-     * Usually specified by the SQL AS. If not specified, return column name.
+     * <p>
+     * The label for the column.
+     * </p>
      * 
-     * @return Usually specified by the SQL AS. If not specified, return column name.
+     * @return The label for the column.
      */
 
     public String getLabel() {
@@ -299,10 +387,12 @@ public String getLabel() {
     }
 
     /**
-     * Usually specified by the SQL AS. If not specified, return column name.
+     * <p>
+     * The label for the column.
+     * </p>
      * 
      * @param label
-     *        Usually specified by the SQL AS. If not specified, return column name.
+     *        The label for the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -312,10 +402,12 @@ public ColumnMetadata withLabel(String label) {
     }
 
     /**
-     * Name of the column.
+     * <p>
+     * The name of the column.
+     * </p>
      * 
      * @param name
-     *        Name of the column.
+     *        The name of the column.
      */
 
     public void setName(String name) {
@@ -323,9 +415,11 @@ public void setName(String name) {
     }
 
     /**
-     * Name of the column.
+     * <p>
+     * The name of the column.
+     * </p>
      * 
-     * @return Name of the column.
+     * @return The name of the column.
      */
 
     public String getName() {
@@ -333,10 +427,12 @@ public String getName() {
     }
 
     /**
-     * Name of the column.
+     * <p>
+     * The name of the column.
+     * </p>
      * 
      * @param name
-     *        Name of the column.
+     *        The name of the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -346,12 +442,12 @@ public ColumnMetadata withName(String name) {
     }
 
     /**
-     * Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1),
-     * columnNullableUnknown (2)
+     * <p>
+     * A value that indicates whether the column is nullable.
+     * </p>
      * 
      * @param nullable
-     *        Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable
-     *        (1), columnNullableUnknown (2)
+     *        A value that indicates whether the column is nullable.
      */
 
     public void setNullable(Integer nullable) {
@@ -359,11 +455,11 @@ public void setNullable(Integer nullable) {
     }
 
     /**
-     * Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1),
-     * columnNullableUnknown (2)
+     * <p>
+     * A value that indicates whether the column is nullable.
+     * </p>
      * 
-     * @return Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable
-     *         (1), columnNullableUnknown (2)
+     * @return A value that indicates whether the column is nullable.
      */
 
     public Integer getNullable() {
@@ -371,12 +467,12 @@ public Integer getNullable() {
     }
 
     /**
-     * Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable (1),
-     * columnNullableUnknown (2)
+     * <p>
+     * A value that indicates whether the column is nullable.
+     * </p>
      * 
      * @param nullable
-     *        Indicates the nullability of values in the designated column. One of columnNoNulls (0), columnNullable
-     *        (1), columnNullableUnknown (2)
+     *        A value that indicates whether the column is nullable.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -386,18 +482,12 @@ public ColumnMetadata withNullable(Integer nullable) {
     }
 
     /**
-     * Get the designated column's specified column size.For numeric data, this is the maximum precision. For character
-     * data, this is the length in characters. For datetime datatypes, this is the length in characters of the String
-     * representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this
-     * is the length in bytes. For the ROWID datatype, this is the length in bytes. 0 is returned for data types where
-     * the column size is not applicable.
+     * <p>
+     * The precision value of a decimal number column.
+     * </p>
      * 
      * @param precision
-     *        Get the designated column's specified column size.For numeric data, this is the maximum precision. For
-     *        character data, this is the length in characters. For datetime datatypes, this is the length in characters
-     *        of the String representation (assuming the maximum allowed precision of the fractional seconds component).
-     *        For binary data, this is the length in bytes. For the ROWID datatype, this is the length in bytes. 0 is
-     *        returned for data types where the column size is not applicable.
+     *        The precision value of a decimal number column.
      */
 
     public void setPrecision(Integer precision) {
@@ -405,17 +495,11 @@ public void setPrecision(Integer precision) {
     }
 
     /**
-     * Get the designated column's specified column size.For numeric data, this is the maximum precision. For character
-     * data, this is the length in characters. For datetime datatypes, this is the length in characters of the String
-     * representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this
-     * is the length in bytes. For the ROWID datatype, this is the length in bytes. 0 is returned for data types where
-     * the column size is not applicable.
+     * <p>
+     * The precision value of a decimal number column.
+     * </p>
      * 
-     * @return Get the designated column's specified column size.For numeric data, this is the maximum precision. For
-     *         character data, this is the length in characters. For datetime datatypes, this is the length in
-     *         characters of the String representation (assuming the maximum allowed precision of the fractional seconds
-     *         component). For binary data, this is the length in bytes. For the ROWID datatype, this is the length in
-     *         bytes. 0 is returned for data types where the column size is not applicable.
+     * @return The precision value of a decimal number column.
      */
 
     public Integer getPrecision() {
@@ -423,18 +507,12 @@ public Integer getPrecision() {
     }
 
     /**
-     * Get the designated column's specified column size.For numeric data, this is the maximum precision. For character
-     * data, this is the length in characters. For datetime datatypes, this is the length in characters of the String
-     * representation (assuming the maximum allowed precision of the fractional seconds component). For binary data, this
-     * is the length in bytes. For the ROWID datatype, this is the length in bytes. 0 is returned for data types where
-     * the column size is not applicable.
+     * <p>
+     * The precision value of a decimal number column.
+     * </p>
      * 
      * @param precision
-     *        Get the designated column's specified column size.For numeric data, this is the maximum precision. For
-     *        character data, this is the length in characters. For datetime datatypes, this is the length in characters
-     *        of the String representation (assuming the maximum allowed precision of the fractional seconds component).
-     *        For binary data, this is the length in bytes. For the ROWID datatype, this is the length in bytes. 0 is
-     *        returned for data types where the column size is not applicable.
+     *        The precision value of a decimal number column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -444,12 +522,12 @@ public ColumnMetadata withPrecision(Integer precision) {
     }
 
     /**
-     * Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale
-     * is not applicable.
+     * <p>
+     * The scale value of a decimal number column.
+     * </p>
      * 
      * @param scale
-     *        Designated column's number of digits to right of the decimal point. 0 is returned for data types where the
-     *        scale is not applicable.
+     *        The scale value of a decimal number column.
      */
 
     public void setScale(Integer scale) {
@@ -457,11 +535,11 @@ public void setScale(Integer scale) {
     }
 
     /**
-     * Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale
-     * is not applicable.
+     * <p>
+     * The scale value of a decimal number column.
+     * </p>
      * 
-     * @return Designated column's number of digits to right of the decimal point. 0 is returned for data types where
-     *         the scale is not applicable.
+     * @return The scale value of a decimal number column.
      */
 
     public Integer getScale() {
@@ -469,12 +547,12 @@ public Integer getScale() {
     }
 
     /**
-     * Designated column's number of digits to right of the decimal point. 0 is returned for data types where the scale
-     * is not applicable.
+     * <p>
+     * The scale value of a decimal number column.
+     * </p>
      * 
      * @param scale
-     *        Designated column's number of digits to right of the decimal point. 0 is returned for data types where the
-     *        scale is not applicable.
+     *        The scale value of a decimal number column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -484,10 +562,12 @@ public ColumnMetadata withScale(Integer scale) {
     }
 
     /**
-     * Designated column's table's schema
+     * <p>
+     * The name of the schema that owns the table that includes the column.
+     * </p>
      * 
      * @param schemaName
-     *        Designated column's table's schema
+     *        The name of the schema that owns the table that includes the column.
      */
 
     public void setSchemaName(String schemaName) {
@@ -495,9 +575,11 @@ public void setSchemaName(String schemaName) {
     }
 
     /**
-     * Designated column's table's schema
+     * <p>
+     * The name of the schema that owns the table that includes the column.
+     * </p>
      * 
-     * @return Designated column's table's schema
+     * @return The name of the schema that owns the table that includes the column.
      */
 
     public String getSchemaName() {
@@ -505,10 +587,12 @@ public String getSchemaName() {
     }
 
     /**
-     * Designated column's table's schema
+     * <p>
+     * The name of the schema that owns the table that includes the column.
+     * </p>
      * 
      * @param schemaName
-     *        Designated column's table's schema
+     *        The name of the schema that owns the table that includes the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -518,10 +602,12 @@ public ColumnMetadata withSchemaName(String schemaName) {
     }
 
     /**
-     * Designated column's table name
+     * <p>
+     * The name of the table that includes the column.
+     * </p>
      * 
      * @param tableName
-     *        Designated column's table name
+     *        The name of the table that includes the column.
      */
 
     public void setTableName(String tableName) {
@@ -529,9 +615,11 @@ public void setTableName(String tableName) {
     }
 
     /**
-     * Designated column's table name
+     * <p>
+     * The name of the table that includes the column.
+     * </p>
      * 
-     * @return Designated column's table name
+     * @return The name of the table that includes the column.
      */
 
     public String getTableName() {
@@ -539,10 +627,12 @@ public String getTableName() {
     }
 
     /**
-     * Designated column's table name
+     * <p>
+     * The name of the table that includes the column.
+     * </p>
      * 
      * @param tableName
-     *        Designated column's table name
+     *        The name of the table that includes the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -552,10 +642,12 @@ public ColumnMetadata withTableName(String tableName) {
     }
 
     /**
-     * SQL type from java.sql.Types.
+     * <p>
+     * The type of the column.
+     * </p>
      * 
      * @param type
-     *        SQL type from java.sql.Types.
+     *        The type of the column.
      */
 
     public void setType(Integer type) {
@@ -563,9 +655,11 @@ public void setType(Integer type) {
     }
 
     /**
-     * SQL type from java.sql.Types.
+     * <p>
+     * The type of the column.
+     * </p>
      * 
-     * @return SQL type from java.sql.Types.
+     * @return The type of the column.
      */
 
     public Integer getType() {
@@ -573,10 +667,12 @@ public Integer getType() {
     }
 
     /**
-     * SQL type from java.sql.Types.
+     * <p>
+     * The type of the column.
+     * </p>
      * 
      * @param type
-     *        SQL type from java.sql.Types.
+     *        The type of the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -586,10 +682,12 @@ public ColumnMetadata withType(Integer type) {
     }
 
     /**
-     * Database-specific type name.
+     * <p>
+     * The database-specific data type of the column.
+     * </p>
      * 
      * @param typeName
-     *        Database-specific type name.
+     *        The database-specific data type of the column.
      */
 
     public void setTypeName(String typeName) {
@@ -597,9 +695,11 @@ public void setTypeName(String typeName) {
     }
 
     /**
-     * Database-specific type name.
+     * <p>
+     * The database-specific data type of the column.
+     * </p>
      * 
-     * @return Database-specific type name.
+     * @return The database-specific data type of the column.
      */
 
     public String getTypeName() {
@@ -607,10 +707,12 @@ public String getTypeName() {
     }
 
     /**
-     * Database-specific type name.
+     * <p>
+     * The database-specific data type of the column.
+     * </p>
      * 
      * @param typeName
-     *        Database-specific type name.
+     *        The database-specific data type of the column.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/CommitTransactionRequest.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/CommitTransactionRequest.java
new file mode 100644
index 000000000000..b5f5f4c9c9b5
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/CommitTransactionRequest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * <p>
+ * The request parameters represent the input of a commit transaction request.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/CommitTransaction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CommitTransactionRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     */
+    private String secretArn;
+    /**
+     * <p>
+     * The identifier of the transaction to end and commit.
+     * </p>
+     */
+    private String transactionId;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CommitTransactionRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public void setSecretArn(String secretArn) {
+        this.secretArn = secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @return The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public String getSecretArn() {
+        return this.secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CommitTransactionRequest withSecretArn(String secretArn) {
+        setSecretArn(secretArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The identifier of the transaction to end and commit.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of the transaction to end and commit.
+     */
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of the transaction to end and commit.
+     * </p>
+     * 
+     * @return The identifier of the transaction to end and commit.
+     */
+
+    public String getTransactionId() {
+        return this.transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of the transaction to end and commit.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of the transaction to end and commit.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CommitTransactionRequest withTransactionId(String transactionId) {
+        setTransactionId(transactionId);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getSecretArn() != null)
+            sb.append("SecretArn: ").append(getSecretArn()).append(",");
+        if (getTransactionId() != null)
+            sb.append("TransactionId: ").append(getTransactionId());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CommitTransactionRequest == false)
+            return false;
+        CommitTransactionRequest other = (CommitTransactionRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getSecretArn() == null ^ this.getSecretArn() == null)
+            return false;
+        if (other.getSecretArn() != null && other.getSecretArn().equals(this.getSecretArn()) == false)
+            return false;
+        if (other.getTransactionId() == null ^ this.getTransactionId() == null)
+            return false;
+        if (other.getTransactionId() != null && other.getTransactionId().equals(this.getTransactionId()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getSecretArn() == null) ? 0 : getSecretArn().hashCode());
+        hashCode = prime * hashCode + ((getTransactionId() == null) ? 0 : getTransactionId().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CommitTransactionRequest clone() {
+        return (CommitTransactionRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/CommitTransactionResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/CommitTransactionResult.java
new file mode 100644
index 000000000000..cb521f0e6779
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/CommitTransactionResult.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The response elements represent the output of a commit transaction request.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/CommitTransaction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CommitTransactionResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The status of the commit operation.
+     * </p>
+     */
+    private String transactionStatus;
+
+    /**
+     * <p>
+     * The status of the commit operation.
+     * </p>
+     * 
+     * @param transactionStatus
+     *        The status of the commit operation.
+     */
+
+    public void setTransactionStatus(String transactionStatus) {
+        this.transactionStatus = transactionStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the commit operation.
+     * </p>
+     * 
+     * @return The status of the commit operation.
+     */
+
+    public String getTransactionStatus() {
+        return this.transactionStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the commit operation.
+     * </p>
+     * 
+     * @param transactionStatus
+     *        The status of the commit operation.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public CommitTransactionResult withTransactionStatus(String transactionStatus) {
+        setTransactionStatus(transactionStatus);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTransactionStatus() != null)
+            sb.append("TransactionStatus: ").append(getTransactionStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof CommitTransactionResult == false)
+            return false;
+        CommitTransactionResult other = (CommitTransactionResult) obj;
+        if (other.getTransactionStatus() == null ^ this.getTransactionStatus() == null)
+            return false;
+        if (other.getTransactionStatus() != null && other.getTransactionStatus().equals(this.getTransactionStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTransactionStatus() == null) ? 0 : getTransactionStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public CommitTransactionResult clone() {
+        try {
+            return (CommitTransactionResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlRequest.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlRequest.java
index dfba6790ebae..68768098e0b6 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlRequest.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlRequest.java
@@ -18,7 +18,9 @@
 import com.amazonaws.AmazonWebServiceRequest;
 
 /**
- * Execute SQL Request
+ * <p>
+ * The request parameters represent the input of a request to run one or more SQL statements.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteSql" target="_top">AWS API
  *      Documentation</a>
@@ -26,22 +28,48 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ExecuteSqlRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
 
-    /** ARN of the db credentials in AWS Secret Store or the friendly secret name */
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
+     * </p>
+     */
     private String awsSecretStoreArn;
-    /** Target DB name */
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     */
     private String database;
-    /** ARN of the target db cluster or instance */
+    /**
+     * <p>
+     * The ARN of the Aurora Serverless DB cluster.
+     * </p>
+     */
     private String dbClusterOrInstanceArn;
-    /** Target Schema name */
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     */
     private String schema;
-    /** SQL statement(s) to be executed. Statements can be chained by using semicolons */
+    /**
+     * <p>
+     * One or more SQL statements to run on the DB cluster.
+     * </p>
+     * <p>
+     * You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is permitted,
+     * including data definition, data manipulation, and commit statements.
+     * </p>
+     */
     private String sqlStatements;
 
     /**
-     * ARN of the db credentials in AWS Secret Store or the friendly secret name
+     * <p>
+     * The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
+     * </p>
      * 
      * @param awsSecretStoreArn
-     *        ARN of the db credentials in AWS Secret Store or the friendly secret name
+     *        The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
      */
 
     public void setAwsSecretStoreArn(String awsSecretStoreArn) {
@@ -49,9 +77,11 @@ public void setAwsSecretStoreArn(String awsSecretStoreArn) {
     }
 
     /**
-     * ARN of the db credentials in AWS Secret Store or the friendly secret name
+     * <p>
+     * The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
+     * </p>
      * 
-     * @return ARN of the db credentials in AWS Secret Store or the friendly secret name
+     * @return The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
      */
 
     public String getAwsSecretStoreArn() {
@@ -59,10 +89,12 @@ public String getAwsSecretStoreArn() {
     }
 
     /**
-     * ARN of the db credentials in AWS Secret Store or the friendly secret name
+     * <p>
+     * The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
+     * </p>
      * 
      * @param awsSecretStoreArn
-     *        ARN of the db credentials in AWS Secret Store or the friendly secret name
+     *        The Amazon Resource Name (ARN) of the secret that enables access to the DB cluster.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -72,10 +104,12 @@ public ExecuteSqlRequest withAwsSecretStoreArn(String awsSecretStoreArn) {
     }
 
     /**
-     * Target DB name
+     * <p>
+     * The name of the database.
+     * </p>
      * 
      * @param database
-     *        Target DB name
+     *        The name of the database.
      */
 
     public void setDatabase(String database) {
@@ -83,9 +117,11 @@ public void setDatabase(String database) {
     }
 
     /**
-     * Target DB name
+     * <p>
+     * The name of the database.
+     * </p>
      * 
-     * @return Target DB name
+     * @return The name of the database.
      */
 
     public String getDatabase() {
@@ -93,10 +129,12 @@ public String getDatabase() {
     }
 
     /**
-     * Target DB name
+     * <p>
+     * The name of the database.
+     * </p>
      * 
      * @param database
-     *        Target DB name
+     *        The name of the database.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -106,10 +144,12 @@ public ExecuteSqlRequest withDatabase(String database) {
     }
 
     /**
-     * ARN of the target db cluster or instance
+     * <p>
+     * The ARN of the Aurora Serverless DB cluster.
+     * </p>
      * 
      * @param dbClusterOrInstanceArn
-     *        ARN of the target db cluster or instance
+     *        The ARN of the Aurora Serverless DB cluster.
      */
 
     public void setDbClusterOrInstanceArn(String dbClusterOrInstanceArn) {
@@ -117,9 +157,11 @@ public void setDbClusterOrInstanceArn(String dbClusterOrInstanceArn) {
     }
 
     /**
-     * ARN of the target db cluster or instance
+     * <p>
+     * The ARN of the Aurora Serverless DB cluster.
+     * </p>
      * 
-     * @return ARN of the target db cluster or instance
+     * @return The ARN of the Aurora Serverless DB cluster.
      */
 
     public String getDbClusterOrInstanceArn() {
@@ -127,10 +169,12 @@ public String getDbClusterOrInstanceArn() {
     }
 
     /**
-     * ARN of the target db cluster or instance
+     * <p>
+     * The ARN of the Aurora Serverless DB cluster.
+     * </p>
      * 
      * @param dbClusterOrInstanceArn
-     *        ARN of the target db cluster or instance
+     *        The ARN of the Aurora Serverless DB cluster.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -140,10 +184,12 @@ public ExecuteSqlRequest withDbClusterOrInstanceArn(String dbClusterOrInstanceAr
     }
 
     /**
-     * Target Schema name
+     * <p>
+     * The name of the database schema.
+     * </p>
      * 
      * @param schema
-     *        Target Schema name
+     *        The name of the database schema.
      */
 
     public void setSchema(String schema) {
@@ -151,9 +197,11 @@ public void setSchema(String schema) {
     }
 
     /**
-     * Target Schema name
+     * <p>
+     * The name of the database schema.
+     * </p>
      * 
-     * @return Target Schema name
+     * @return The name of the database schema.
      */
 
     public String getSchema() {
@@ -161,10 +209,12 @@ public String getSchema() {
     }
 
     /**
-     * Target Schema name
+     * <p>
+     * The name of the database schema.
+     * </p>
      * 
      * @param schema
-     *        Target Schema name
+     *        The name of the database schema.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -174,10 +224,19 @@ public ExecuteSqlRequest withSchema(String schema) {
     }
 
     /**
-     * SQL statement(s) to be executed. Statements can be chained by using semicolons
+     * <p>
+     * One or more SQL statements to run on the DB cluster.
+     * </p>
+     * <p>
+     * You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is permitted,
+     * including data definition, data manipulation, and commit statements.
+     * </p>
      * 
      * @param sqlStatements
-     *        SQL statement(s) to be executed. Statements can be chained by using semicolons
+     *        One or more SQL statements to run on the DB cluster.</p>
+     *        <p>
+     *        You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is
+     *        permitted, including data definition, data manipulation, and commit statements.
      */
 
     public void setSqlStatements(String sqlStatements) {
@@ -185,9 +244,18 @@ public void setSqlStatements(String sqlStatements) {
     }
 
     /**
-     * SQL statement(s) to be executed. Statements can be chained by using semicolons
+     * <p>
+     * One or more SQL statements to run on the DB cluster.
+     * </p>
+     * <p>
+     * You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is permitted,
+     * including data definition, data manipulation, and commit statements.
+     * </p>
      * 
-     * @return SQL statement(s) to be executed. Statements can be chained by using semicolons
+     * @return One or more SQL statements to run on the DB cluster.</p>
+     *         <p>
+     *         You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is
+     *         permitted, including data definition, data manipulation, and commit statements.
      */
 
     public String getSqlStatements() {
@@ -195,10 +263,19 @@ public String getSqlStatements() {
     }
 
     /**
-     * SQL statement(s) to be executed. Statements can be chained by using semicolons
+     * <p>
+     * One or more SQL statements to run on the DB cluster.
+     * </p>
+     * <p>
+     * You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is permitted,
+     * including data definition, data manipulation, and commit statements.
+     * </p>
      * 
      * @param sqlStatements
-     *        SQL statement(s) to be executed. Statements can be chained by using semicolons
+     *        One or more SQL statements to run on the DB cluster.</p>
+     *        <p>
+     *        You can separate SQL statements from each other with a semicolon (;). Any valid SQL statement is
+     *        permitted, including data definition, data manipulation, and commit statements.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlResult.java
index 0ea5c2f5451d..af812ffa17c5 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlResult.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteSqlResult.java
@@ -16,7 +16,9 @@
 import javax.annotation.Generated;
 
 /**
- * Execute SQL response
+ * <p>
+ * The response elements represent the output of a request to run one or more SQL statements.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteSql" target="_top">AWS API
  *      Documentation</a>
@@ -24,13 +26,19 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ExecuteSqlResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
 
-    /** Results returned by executing the sql statement(s) */
+    /**
+     * <p>
+     * The results of the SQL statement or statements.
+     * </p>
+     */
     private java.util.List<SqlStatementResult> sqlStatementResults;
 
     /**
-     * Results returned by executing the sql statement(s)
+     * <p>
+     * The results of the SQL statement or statements.
+     * </p>
      * 
-     * @return Results returned by executing the sql statement(s)
+     * @return The results of the SQL statement or statements.
      */
 
     public java.util.List<SqlStatementResult> getSqlStatementResults() {
@@ -38,10 +46,12 @@ public java.util.List<SqlStatementResult> getSqlStatementResults() {
     }
 
     /**
-     * Results returned by executing the sql statement(s)
+     * <p>
+     * The results of the SQL statement or statements.
+     * </p>
      * 
      * @param sqlStatementResults
-     *        Results returned by executing the sql statement(s)
+     *        The results of the SQL statement or statements.
      */
 
     public void setSqlStatementResults(java.util.Collection<SqlStatementResult> sqlStatementResults) {
@@ -54,7 +64,9 @@ public void setSqlStatementResults(java.util.Collection<SqlStatementResult> sqlS
     }
 
     /**
-     * Results returned by executing the sql statement(s)
+     * <p>
+     * The results of the SQL statement or statements.
+     * </p>
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setSqlStatementResults(java.util.Collection)} or {@link #withSqlStatementResults(java.util.Collection)}
@@ -62,7 +74,7 @@ public void setSqlStatementResults(java.util.Collection<SqlStatementResult> sqlS
      * </p>
      * 
      * @param sqlStatementResults
-     *        Results returned by executing the sql statement(s)
+     *        The results of the SQL statement or statements.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -77,10 +89,12 @@ public ExecuteSqlResult withSqlStatementResults(SqlStatementResult... sqlStateme
     }
 
     /**
-     * Results returned by executing the sql statement(s)
+     * <p>
+     * The results of the SQL statement or statements.
+     * </p>
      * 
      * @param sqlStatementResults
-     *        Results returned by executing the sql statement(s)
+     *        The results of the SQL statement or statements.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteStatementRequest.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteStatementRequest.java
new file mode 100644
index 000000000000..c7d345f85854
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteStatementRequest.java
@@ -0,0 +1,689 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * <p>
+ * The request parameters represent the input of a request to run a SQL statement against a database.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteStatement" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ExecuteStatementRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * A value that indicates whether to continue running the statement after the call times out. By default, the
+     * statement stops running when the call times out.
+     * </p>
+     * <important>
+     * <p>
+     * For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL statement
+     * terminates before it is finished running, it can result in errors and possibly corrupted data structures.
+     * </p>
+     * </important>
+     */
+    private Boolean continueAfterTimeout;
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     */
+    private String database;
+    /**
+     * <p>
+     * A value that indicates whether to include metadata in the results.
+     * </p>
+     */
+    private Boolean includeResultMetadata;
+    /**
+     * <p>
+     * The parameters for the SQL statement.
+     * </p>
+     */
+    private java.util.List<SqlParameter> parameters;
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     */
+    private String schema;
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     */
+    private String secretArn;
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     */
+    private String sql;
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     */
+    private String transactionId;
+
+    /**
+     * <p>
+     * A value that indicates whether to continue running the statement after the call times out. By default, the
+     * statement stops running when the call times out.
+     * </p>
+     * <important>
+     * <p>
+     * For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL statement
+     * terminates before it is finished running, it can result in errors and possibly corrupted data structures.
+     * </p>
+     * </important>
+     * 
+     * @param continueAfterTimeout
+     *        A value that indicates whether to continue running the statement after the call times out. By default, the
+     *        statement stops running when the call times out.</p> <important>
+     *        <p>
+     *        For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL
+     *        statement terminates before it is finished running, it can result in errors and possibly corrupted data
+     *        structures.
+     *        </p>
+     */
+
+    public void setContinueAfterTimeout(Boolean continueAfterTimeout) {
+        this.continueAfterTimeout = continueAfterTimeout;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to continue running the statement after the call times out. By default, the
+     * statement stops running when the call times out.
+     * </p>
+     * <important>
+     * <p>
+     * For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL statement
+     * terminates before it is finished running, it can result in errors and possibly corrupted data structures.
+     * </p>
+     * </important>
+     * 
+     * @return A value that indicates whether to continue running the statement after the call times out. By default,
+     *         the statement stops running when the call times out.</p> <important>
+     *         <p>
+     *         For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL
+     *         statement terminates before it is finished running, it can result in errors and possibly corrupted data
+     *         structures.
+     *         </p>
+     */
+
+    public Boolean getContinueAfterTimeout() {
+        return this.continueAfterTimeout;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to continue running the statement after the call times out. By default, the
+     * statement stops running when the call times out.
+     * </p>
+     * <important>
+     * <p>
+     * For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL statement
+     * terminates before it is finished running, it can result in errors and possibly corrupted data structures.
+     * </p>
+     * </important>
+     * 
+     * @param continueAfterTimeout
+     *        A value that indicates whether to continue running the statement after the call times out. By default, the
+     *        statement stops running when the call times out.</p> <important>
+     *        <p>
+     *        For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL
+     *        statement terminates before it is finished running, it can result in errors and possibly corrupted data
+     *        structures.
+     *        </p>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withContinueAfterTimeout(Boolean continueAfterTimeout) {
+        setContinueAfterTimeout(continueAfterTimeout);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to continue running the statement after the call times out. By default, the
+     * statement stops running when the call times out.
+     * </p>
+     * <important>
+     * <p>
+     * For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL statement
+     * terminates before it is finished running, it can result in errors and possibly corrupted data structures.
+     * </p>
+     * </important>
+     * 
+     * @return A value that indicates whether to continue running the statement after the call times out. By default,
+     *         the statement stops running when the call times out.</p> <important>
+     *         <p>
+     *         For DDL statements, we recommend continuing to run the statement after the call times out. When a DDL
+     *         statement terminates before it is finished running, it can result in errors and possibly corrupted data
+     *         structures.
+     *         </p>
+     */
+
+    public Boolean isContinueAfterTimeout() {
+        return this.continueAfterTimeout;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @param database
+     *        The name of the database.
+     */
+
+    public void setDatabase(String database) {
+        this.database = database;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @return The name of the database.
+     */
+
+    public String getDatabase() {
+        return this.database;
+    }
+
+    /**
+     * <p>
+     * The name of the database.
+     * </p>
+     * 
+     * @param database
+     *        The name of the database.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withDatabase(String database) {
+        setDatabase(database);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to include metadata in the results.
+     * </p>
+     * 
+     * @param includeResultMetadata
+     *        A value that indicates whether to include metadata in the results.
+     */
+
+    public void setIncludeResultMetadata(Boolean includeResultMetadata) {
+        this.includeResultMetadata = includeResultMetadata;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to include metadata in the results.
+     * </p>
+     * 
+     * @return A value that indicates whether to include metadata in the results.
+     */
+
+    public Boolean getIncludeResultMetadata() {
+        return this.includeResultMetadata;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to include metadata in the results.
+     * </p>
+     * 
+     * @param includeResultMetadata
+     *        A value that indicates whether to include metadata in the results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withIncludeResultMetadata(Boolean includeResultMetadata) {
+        setIncludeResultMetadata(includeResultMetadata);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A value that indicates whether to include metadata in the results.
+     * </p>
+     * 
+     * @return A value that indicates whether to include metadata in the results.
+     */
+
+    public Boolean isIncludeResultMetadata() {
+        return this.includeResultMetadata;
+    }
+
+    /**
+     * <p>
+     * The parameters for the SQL statement.
+     * </p>
+     * 
+     * @return The parameters for the SQL statement.
+     */
+
+    public java.util.List<SqlParameter> getParameters() {
+        return parameters;
+    }
+
+    /**
+     * <p>
+     * The parameters for the SQL statement.
+     * </p>
+     * 
+     * @param parameters
+     *        The parameters for the SQL statement.
+     */
+
+    public void setParameters(java.util.Collection<SqlParameter> parameters) {
+        if (parameters == null) {
+            this.parameters = null;
+            return;
+        }
+
+        this.parameters = new java.util.ArrayList<SqlParameter>(parameters);
+    }
+
+    /**
+     * <p>
+     * The parameters for the SQL statement.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setParameters(java.util.Collection)} or {@link #withParameters(java.util.Collection)} if you want to
+     * override the existing values.
+     * </p>
+     * 
+     * @param parameters
+     *        The parameters for the SQL statement.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withParameters(SqlParameter... parameters) {
+        if (this.parameters == null) {
+            setParameters(new java.util.ArrayList<SqlParameter>(parameters.length));
+        }
+        for (SqlParameter ele : parameters) {
+            this.parameters.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The parameters for the SQL statement.
+     * </p>
+     * 
+     * @param parameters
+     *        The parameters for the SQL statement.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withParameters(java.util.Collection<SqlParameter> parameters) {
+        setParameters(parameters);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @param schema
+     *        The name of the database schema.
+     */
+
+    public void setSchema(String schema) {
+        this.schema = schema;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @return The name of the database schema.
+     */
+
+    public String getSchema() {
+        return this.schema;
+    }
+
+    /**
+     * <p>
+     * The name of the database schema.
+     * </p>
+     * 
+     * @param schema
+     *        The name of the database schema.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withSchema(String schema) {
+        setSchema(schema);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public void setSecretArn(String secretArn) {
+        this.secretArn = secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @return The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public String getSecretArn() {
+        return this.secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withSecretArn(String secretArn) {
+        setSecretArn(secretArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     * 
+     * @param sql
+     *        The SQL statement to run.
+     */
+
+    public void setSql(String sql) {
+        this.sql = sql;
+    }
+
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     * 
+     * @return The SQL statement to run.
+     */
+
+    public String getSql() {
+        return this.sql;
+    }
+
+    /**
+     * <p>
+     * The SQL statement to run.
+     * </p>
+     * 
+     * @param sql
+     *        The SQL statement to run.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withSql(String sql) {
+        setSql(sql);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation.
+     *        Specify the transaction ID of the transaction that you want to include the SQL statement in.</p>
+     *        <p>
+     *        If the SQL statement is not part of a transaction, don't set this parameter.
+     */
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     * 
+     * @return The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation.
+     *         Specify the transaction ID of the transaction that you want to include the SQL statement in.</p>
+     *         <p>
+     *         If the SQL statement is not part of a transaction, don't set this parameter.
+     */
+
+    public String getTransactionId() {
+        return this.transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation. Specify
+     * the transaction ID of the transaction that you want to include the SQL statement in.
+     * </p>
+     * <p>
+     * If the SQL statement is not part of a transaction, don't set this parameter.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of a transaction that was started by using the <code>BeginTransaction</code> operation.
+     *        Specify the transaction ID of the transaction that you want to include the SQL statement in.</p>
+     *        <p>
+     *        If the SQL statement is not part of a transaction, don't set this parameter.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementRequest withTransactionId(String transactionId) {
+        setTransactionId(transactionId);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getContinueAfterTimeout() != null)
+            sb.append("ContinueAfterTimeout: ").append(getContinueAfterTimeout()).append(",");
+        if (getDatabase() != null)
+            sb.append("Database: ").append(getDatabase()).append(",");
+        if (getIncludeResultMetadata() != null)
+            sb.append("IncludeResultMetadata: ").append(getIncludeResultMetadata()).append(",");
+        if (getParameters() != null)
+            sb.append("Parameters: ").append(getParameters()).append(",");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getSchema() != null)
+            sb.append("Schema: ").append(getSchema()).append(",");
+        if (getSecretArn() != null)
+            sb.append("SecretArn: ").append(getSecretArn()).append(",");
+        if (getSql() != null)
+            sb.append("Sql: ").append(getSql()).append(",");
+        if (getTransactionId() != null)
+            sb.append("TransactionId: ").append(getTransactionId());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ExecuteStatementRequest == false)
+            return false;
+        ExecuteStatementRequest other = (ExecuteStatementRequest) obj;
+        if (other.getContinueAfterTimeout() == null ^ this.getContinueAfterTimeout() == null)
+            return false;
+        if (other.getContinueAfterTimeout() != null && other.getContinueAfterTimeout().equals(this.getContinueAfterTimeout()) == false)
+            return false;
+        if (other.getDatabase() == null ^ this.getDatabase() == null)
+            return false;
+        if (other.getDatabase() != null && other.getDatabase().equals(this.getDatabase()) == false)
+            return false;
+        if (other.getIncludeResultMetadata() == null ^ this.getIncludeResultMetadata() == null)
+            return false;
+        if (other.getIncludeResultMetadata() != null && other.getIncludeResultMetadata().equals(this.getIncludeResultMetadata()) == false)
+            return false;
+        if (other.getParameters() == null ^ this.getParameters() == null)
+            return false;
+        if (other.getParameters() != null && other.getParameters().equals(this.getParameters()) == false)
+            return false;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getSchema() == null ^ this.getSchema() == null)
+            return false;
+        if (other.getSchema() != null && other.getSchema().equals(this.getSchema()) == false)
+            return false;
+        if (other.getSecretArn() == null ^ this.getSecretArn() == null)
+            return false;
+        if (other.getSecretArn() != null && other.getSecretArn().equals(this.getSecretArn()) == false)
+            return false;
+        if (other.getSql() == null ^ this.getSql() == null)
+            return false;
+        if (other.getSql() != null && other.getSql().equals(this.getSql()) == false)
+            return false;
+        if (other.getTransactionId() == null ^ this.getTransactionId() == null)
+            return false;
+        if (other.getTransactionId() != null && other.getTransactionId().equals(this.getTransactionId()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getContinueAfterTimeout() == null) ? 0 : getContinueAfterTimeout().hashCode());
+        hashCode = prime * hashCode + ((getDatabase() == null) ? 0 : getDatabase().hashCode());
+        hashCode = prime * hashCode + ((getIncludeResultMetadata() == null) ? 0 : getIncludeResultMetadata().hashCode());
+        hashCode = prime * hashCode + ((getParameters() == null) ? 0 : getParameters().hashCode());
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getSchema() == null) ? 0 : getSchema().hashCode());
+        hashCode = prime * hashCode + ((getSecretArn() == null) ? 0 : getSecretArn().hashCode());
+        hashCode = prime * hashCode + ((getSql() == null) ? 0 : getSql().hashCode());
+        hashCode = prime * hashCode + ((getTransactionId() == null) ? 0 : getTransactionId().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ExecuteStatementRequest clone() {
+        return (ExecuteStatementRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteStatementResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteStatementResult.java
new file mode 100644
index 000000000000..f3652062fe55
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ExecuteStatementResult.java
@@ -0,0 +1,378 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The response elements represent the output of a request to run a SQL statement against a database.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ExecuteStatement" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ExecuteStatementResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * Metadata for the columns included in the results.
+     * </p>
+     */
+    private java.util.List<ColumnMetadata> columnMetadata;
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     */
+    private java.util.List<Field> generatedFields;
+    /**
+     * <p>
+     * The number of records updated by the request.
+     * </p>
+     */
+    private Long numberOfRecordsUpdated;
+    /**
+     * <p>
+     * The records returned by the SQL statement.
+     * </p>
+     */
+    private java.util.List<java.util.List<Field>> records;
+
+    /**
+     * <p>
+     * Metadata for the columns included in the results.
+     * </p>
+     * 
+     * @return Metadata for the columns included in the results.
+     */
+
+    public java.util.List<ColumnMetadata> getColumnMetadata() {
+        return columnMetadata;
+    }
+
+    /**
+     * <p>
+     * Metadata for the columns included in the results.
+     * </p>
+     * 
+     * @param columnMetadata
+     *        Metadata for the columns included in the results.
+     */
+
+    public void setColumnMetadata(java.util.Collection<ColumnMetadata> columnMetadata) {
+        if (columnMetadata == null) {
+            this.columnMetadata = null;
+            return;
+        }
+
+        this.columnMetadata = new java.util.ArrayList<ColumnMetadata>(columnMetadata);
+    }
+
+    /**
+     * <p>
+     * Metadata for the columns included in the results.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want
+     * to override the existing values.
+     * </p>
+     * 
+     * @param columnMetadata
+     *        Metadata for the columns included in the results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withColumnMetadata(ColumnMetadata... columnMetadata) {
+        if (this.columnMetadata == null) {
+            setColumnMetadata(new java.util.ArrayList<ColumnMetadata>(columnMetadata.length));
+        }
+        for (ColumnMetadata ele : columnMetadata) {
+            this.columnMetadata.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Metadata for the columns included in the results.
+     * </p>
+     * 
+     * @param columnMetadata
+     *        Metadata for the columns included in the results.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withColumnMetadata(java.util.Collection<ColumnMetadata> columnMetadata) {
+        setColumnMetadata(columnMetadata);
+        return this;
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * 
+     * @return Values for fields generated during the request.
+     */
+
+    public java.util.List<Field> getGeneratedFields() {
+        return generatedFields;
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * 
+     * @param generatedFields
+     *        Values for fields generated during the request.
+     */
+
+    public void setGeneratedFields(java.util.Collection<Field> generatedFields) {
+        if (generatedFields == null) {
+            this.generatedFields = null;
+            return;
+        }
+
+        this.generatedFields = new java.util.ArrayList<Field>(generatedFields);
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setGeneratedFields(java.util.Collection)} or {@link #withGeneratedFields(java.util.Collection)} if you
+     * want to override the existing values.
+     * </p>
+     * 
+     * @param generatedFields
+     *        Values for fields generated during the request.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withGeneratedFields(Field... generatedFields) {
+        if (this.generatedFields == null) {
+            setGeneratedFields(new java.util.ArrayList<Field>(generatedFields.length));
+        }
+        for (Field ele : generatedFields) {
+            this.generatedFields.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * 
+     * @param generatedFields
+     *        Values for fields generated during the request.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withGeneratedFields(java.util.Collection<Field> generatedFields) {
+        setGeneratedFields(generatedFields);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The number of records updated by the request.
+     * </p>
+     * 
+     * @param numberOfRecordsUpdated
+     *        The number of records updated by the request.
+     */
+
+    public void setNumberOfRecordsUpdated(Long numberOfRecordsUpdated) {
+        this.numberOfRecordsUpdated = numberOfRecordsUpdated;
+    }
+
+    /**
+     * <p>
+     * The number of records updated by the request.
+     * </p>
+     * 
+     * @return The number of records updated by the request.
+     */
+
+    public Long getNumberOfRecordsUpdated() {
+        return this.numberOfRecordsUpdated;
+    }
+
+    /**
+     * <p>
+     * The number of records updated by the request.
+     * </p>
+     * 
+     * @param numberOfRecordsUpdated
+     *        The number of records updated by the request.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withNumberOfRecordsUpdated(Long numberOfRecordsUpdated) {
+        setNumberOfRecordsUpdated(numberOfRecordsUpdated);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The records returned by the SQL statement.
+     * </p>
+     * 
+     * @return The records returned by the SQL statement.
+     */
+
+    public java.util.List<java.util.List<Field>> getRecords() {
+        return records;
+    }
+
+    /**
+     * <p>
+     * The records returned by the SQL statement.
+     * </p>
+     * 
+     * @param records
+     *        The records returned by the SQL statement.
+     */
+
+    public void setRecords(java.util.Collection<java.util.List<Field>> records) {
+        if (records == null) {
+            this.records = null;
+            return;
+        }
+
+        this.records = new java.util.ArrayList<java.util.List<Field>>(records);
+    }
+
+    /**
+     * <p>
+     * The records returned by the SQL statement.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override
+     * the existing values.
+     * </p>
+     * 
+     * @param records
+     *        The records returned by the SQL statement.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withRecords(java.util.List<Field>... records) {
+        if (this.records == null) {
+            setRecords(new java.util.ArrayList<java.util.List<Field>>(records.length));
+        }
+        for (java.util.List<Field> ele : records) {
+            this.records.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * The records returned by the SQL statement.
+     * </p>
+     * 
+     * @param records
+     *        The records returned by the SQL statement.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ExecuteStatementResult withRecords(java.util.Collection<java.util.List<Field>> records) {
+        setRecords(records);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getColumnMetadata() != null)
+            sb.append("ColumnMetadata: ").append(getColumnMetadata()).append(",");
+        if (getGeneratedFields() != null)
+            sb.append("GeneratedFields: ").append(getGeneratedFields()).append(",");
+        if (getNumberOfRecordsUpdated() != null)
+            sb.append("NumberOfRecordsUpdated: ").append(getNumberOfRecordsUpdated()).append(",");
+        if (getRecords() != null)
+            sb.append("Records: ").append(getRecords());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ExecuteStatementResult == false)
+            return false;
+        ExecuteStatementResult other = (ExecuteStatementResult) obj;
+        if (other.getColumnMetadata() == null ^ this.getColumnMetadata() == null)
+            return false;
+        if (other.getColumnMetadata() != null && other.getColumnMetadata().equals(this.getColumnMetadata()) == false)
+            return false;
+        if (other.getGeneratedFields() == null ^ this.getGeneratedFields() == null)
+            return false;
+        if (other.getGeneratedFields() != null && other.getGeneratedFields().equals(this.getGeneratedFields()) == false)
+            return false;
+        if (other.getNumberOfRecordsUpdated() == null ^ this.getNumberOfRecordsUpdated() == null)
+            return false;
+        if (other.getNumberOfRecordsUpdated() != null && other.getNumberOfRecordsUpdated().equals(this.getNumberOfRecordsUpdated()) == false)
+            return false;
+        if (other.getRecords() == null ^ this.getRecords() == null)
+            return false;
+        if (other.getRecords() != null && other.getRecords().equals(this.getRecords()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getColumnMetadata() == null) ? 0 : getColumnMetadata().hashCode());
+        hashCode = prime * hashCode + ((getGeneratedFields() == null) ? 0 : getGeneratedFields().hashCode());
+        hashCode = prime * hashCode + ((getNumberOfRecordsUpdated() == null) ? 0 : getNumberOfRecordsUpdated().hashCode());
+        hashCode = prime * hashCode + ((getRecords() == null) ? 0 : getRecords().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ExecuteStatementResult clone() {
+        try {
+            return (ExecuteStatementResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Field.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Field.java
new file mode 100644
index 000000000000..a578a740b20a
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Field.java
@@ -0,0 +1,452 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * Contains a value.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/Field" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class Field implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * A value of BLOB data type.
+     * </p>
+     */
+    private java.nio.ByteBuffer blobValue;
+    /**
+     * <p>
+     * A value of Boolean data type.
+     * </p>
+     */
+    private Boolean booleanValue;
+    /**
+     * <p>
+     * A value of double data type.
+     * </p>
+     */
+    private Double doubleValue;
+    /**
+     * <p>
+     * A NULL value.
+     * </p>
+     */
+    private Boolean isNull;
+    /**
+     * <p>
+     * A value of long data type.
+     * </p>
+     */
+    private Long longValue;
+    /**
+     * <p>
+     * A value of string data type.
+     * </p>
+     */
+    private String stringValue;
+
+    /**
+     * <p>
+     * A value of BLOB data type.
+     * </p>
+     * <p>
+     * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
+     * Users of the SDK should not perform Base64 encoding on this field.
+     * </p>
+     * <p>
+     * Warning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will
+     * be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or
+     * ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future
+     * major version of the SDK.
+     * </p>
+     * 
+     * @param blobValue
+     *        A value of BLOB data type.
+     */
+
+    public void setBlobValue(java.nio.ByteBuffer blobValue) {
+        this.blobValue = blobValue;
+    }
+
+    /**
+     * <p>
+     * A value of BLOB data type.
+     * </p>
+     * <p>
+     * {@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend
+     * using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent
+     * {@code position}, and calling {@code get} methods on this rather than directly on the returned {@code ByteBuffer}.
+     * Doing so will ensure that anyone else using the {@code ByteBuffer} will not be affected by changes to the
+     * {@code position}.
+     * </p>
+     * 
+     * @return A value of BLOB data type.
+     */
+
+    public java.nio.ByteBuffer getBlobValue() {
+        return this.blobValue;
+    }
+
+    /**
+     * <p>
+     * A value of BLOB data type.
+     * </p>
+     * <p>
+     * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
+     * Users of the SDK should not perform Base64 encoding on this field.
+     * </p>
+     * <p>
+     * Warning: ByteBuffers returned by the SDK are mutable. Changes to the content or position of the byte buffer will
+     * be seen by all objects that have a reference to this object. It is recommended to call ByteBuffer.duplicate() or
+     * ByteBuffer.asReadOnlyBuffer() before using or reading from the buffer. This behavior will be changed in a future
+     * major version of the SDK.
+     * </p>
+     * 
+     * @param blobValue
+     *        A value of BLOB data type.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Field withBlobValue(java.nio.ByteBuffer blobValue) {
+        setBlobValue(blobValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A value of Boolean data type.
+     * </p>
+     * 
+     * @param booleanValue
+     *        A value of Boolean data type.
+     */
+
+    public void setBooleanValue(Boolean booleanValue) {
+        this.booleanValue = booleanValue;
+    }
+
+    /**
+     * <p>
+     * A value of Boolean data type.
+     * </p>
+     * 
+     * @return A value of Boolean data type.
+     */
+
+    public Boolean getBooleanValue() {
+        return this.booleanValue;
+    }
+
+    /**
+     * <p>
+     * A value of Boolean data type.
+     * </p>
+     * 
+     * @param booleanValue
+     *        A value of Boolean data type.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Field withBooleanValue(Boolean booleanValue) {
+        setBooleanValue(booleanValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A value of Boolean data type.
+     * </p>
+     * 
+     * @return A value of Boolean data type.
+     */
+
+    public Boolean isBooleanValue() {
+        return this.booleanValue;
+    }
+
+    /**
+     * <p>
+     * A value of double data type.
+     * </p>
+     * 
+     * @param doubleValue
+     *        A value of double data type.
+     */
+
+    public void setDoubleValue(Double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+
+    /**
+     * <p>
+     * A value of double data type.
+     * </p>
+     * 
+     * @return A value of double data type.
+     */
+
+    public Double getDoubleValue() {
+        return this.doubleValue;
+    }
+
+    /**
+     * <p>
+     * A value of double data type.
+     * </p>
+     * 
+     * @param doubleValue
+     *        A value of double data type.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Field withDoubleValue(Double doubleValue) {
+        setDoubleValue(doubleValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A NULL value.
+     * </p>
+     * 
+     * @param isNull
+     *        A NULL value.
+     */
+
+    public void setIsNull(Boolean isNull) {
+        this.isNull = isNull;
+    }
+
+    /**
+     * <p>
+     * A NULL value.
+     * </p>
+     * 
+     * @return A NULL value.
+     */
+
+    public Boolean getIsNull() {
+        return this.isNull;
+    }
+
+    /**
+     * <p>
+     * A NULL value.
+     * </p>
+     * 
+     * @param isNull
+     *        A NULL value.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Field withIsNull(Boolean isNull) {
+        setIsNull(isNull);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A NULL value.
+     * </p>
+     * 
+     * @return A NULL value.
+     */
+
+    public Boolean isNull() {
+        return this.isNull;
+    }
+
+    /**
+     * <p>
+     * A value of long data type.
+     * </p>
+     * 
+     * @param longValue
+     *        A value of long data type.
+     */
+
+    public void setLongValue(Long longValue) {
+        this.longValue = longValue;
+    }
+
+    /**
+     * <p>
+     * A value of long data type.
+     * </p>
+     * 
+     * @return A value of long data type.
+     */
+
+    public Long getLongValue() {
+        return this.longValue;
+    }
+
+    /**
+     * <p>
+     * A value of long data type.
+     * </p>
+     * 
+     * @param longValue
+     *        A value of long data type.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Field withLongValue(Long longValue) {
+        setLongValue(longValue);
+        return this;
+    }
+
+    /**
+     * <p>
+     * A value of string data type.
+     * </p>
+     * 
+     * @param stringValue
+     *        A value of string data type.
+     */
+
+    public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+    /**
+     * <p>
+     * A value of string data type.
+     * </p>
+     * 
+     * @return A value of string data type.
+     */
+
+    public String getStringValue() {
+        return this.stringValue;
+    }
+
+    /**
+     * <p>
+     * A value of string data type.
+     * </p>
+     * 
+     * @param stringValue
+     *        A value of string data type.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public Field withStringValue(String stringValue) {
+        setStringValue(stringValue);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getBlobValue() != null)
+            sb.append("BlobValue: ").append(getBlobValue()).append(",");
+        if (getBooleanValue() != null)
+            sb.append("BooleanValue: ").append(getBooleanValue()).append(",");
+        if (getDoubleValue() != null)
+            sb.append("DoubleValue: ").append(getDoubleValue()).append(",");
+        if (getIsNull() != null)
+            sb.append("IsNull: ").append(getIsNull()).append(",");
+        if (getLongValue() != null)
+            sb.append("LongValue: ").append(getLongValue()).append(",");
+        if (getStringValue() != null)
+            sb.append("StringValue: ").append(getStringValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof Field == false)
+            return false;
+        Field other = (Field) obj;
+        if (other.getBlobValue() == null ^ this.getBlobValue() == null)
+            return false;
+        if (other.getBlobValue() != null && other.getBlobValue().equals(this.getBlobValue()) == false)
+            return false;
+        if (other.getBooleanValue() == null ^ this.getBooleanValue() == null)
+            return false;
+        if (other.getBooleanValue() != null && other.getBooleanValue().equals(this.getBooleanValue()) == false)
+            return false;
+        if (other.getDoubleValue() == null ^ this.getDoubleValue() == null)
+            return false;
+        if (other.getDoubleValue() != null && other.getDoubleValue().equals(this.getDoubleValue()) == false)
+            return false;
+        if (other.getIsNull() == null ^ this.getIsNull() == null)
+            return false;
+        if (other.getIsNull() != null && other.getIsNull().equals(this.getIsNull()) == false)
+            return false;
+        if (other.getLongValue() == null ^ this.getLongValue() == null)
+            return false;
+        if (other.getLongValue() != null && other.getLongValue().equals(this.getLongValue()) == false)
+            return false;
+        if (other.getStringValue() == null ^ this.getStringValue() == null)
+            return false;
+        if (other.getStringValue() != null && other.getStringValue().equals(this.getStringValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getBlobValue() == null) ? 0 : getBlobValue().hashCode());
+        hashCode = prime * hashCode + ((getBooleanValue() == null) ? 0 : getBooleanValue().hashCode());
+        hashCode = prime * hashCode + ((getDoubleValue() == null) ? 0 : getDoubleValue().hashCode());
+        hashCode = prime * hashCode + ((getIsNull() == null) ? 0 : getIsNull().hashCode());
+        hashCode = prime * hashCode + ((getLongValue() == null) ? 0 : getLongValue().hashCode());
+        hashCode = prime * hashCode + ((getStringValue() == null) ? 0 : getStringValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public Field clone() {
+        try {
+            return (Field) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.rdsdata.model.transform.FieldMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ForbiddenException.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ForbiddenException.java
index 2c42c13b6337..621e910597a5 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ForbiddenException.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ForbiddenException.java
@@ -15,7 +15,9 @@
 import javax.annotation.Generated;
 
 /**
- * Access denied exception
+ * <p>
+ * There are insufficient privileges to make the call.
+ * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ForbiddenException extends com.amazonaws.services.rdsdata.model.AWSRDSDataException {
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/InternalServerErrorException.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/InternalServerErrorException.java
index 031cc1e07965..d279a24ff125 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/InternalServerErrorException.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/InternalServerErrorException.java
@@ -15,7 +15,9 @@
 import javax.annotation.Generated;
 
 /**
- * Internal service error
+ * <p>
+ * An internal error occurred.
+ * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class InternalServerErrorException extends com.amazonaws.services.rdsdata.model.AWSRDSDataException {
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/NotFoundException.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/NotFoundException.java
new file mode 100644
index 000000000000..393e005ef102
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/NotFoundException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The <code>resourceArn</code>, <code>secretArn</code>, or <code>transactionId</code> value can't be found.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class NotFoundException extends com.amazonaws.services.rdsdata.model.AWSRDSDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Constructs a new NotFoundException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public NotFoundException(String message) {
+        super(message);
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Record.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Record.java
index 1ff2e7ea82a7..49d2a50ac011 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Record.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Record.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * Row or Record
+ * <p>
+ * A record returned by a call.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/Record" target="_top">AWS API
  *      Documentation</a>
@@ -26,13 +28,19 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class Record implements Serializable, Cloneable, StructuredPojo {
 
-    /** Record */
+    /**
+     * <p>
+     * The values returned in the record.
+     * </p>
+     */
     private java.util.List<Value> values;
 
     /**
-     * Record
+     * <p>
+     * The values returned in the record.
+     * </p>
      * 
-     * @return Record
+     * @return The values returned in the record.
      */
 
     public java.util.List<Value> getValues() {
@@ -40,10 +48,12 @@ public java.util.List<Value> getValues() {
     }
 
     /**
-     * Record
+     * <p>
+     * The values returned in the record.
+     * </p>
      * 
      * @param values
-     *        Record
+     *        The values returned in the record.
      */
 
     public void setValues(java.util.Collection<Value> values) {
@@ -56,7 +66,9 @@ public void setValues(java.util.Collection<Value> values) {
     }
 
     /**
-     * Record
+     * <p>
+     * The values returned in the record.
+     * </p>
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setValues(java.util.Collection)} or {@link #withValues(java.util.Collection)} if you want to override the
@@ -64,7 +76,7 @@ public void setValues(java.util.Collection<Value> values) {
      * </p>
      * 
      * @param values
-     *        Record
+     *        The values returned in the record.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -79,10 +91,12 @@ public Record withValues(Value... values) {
     }
 
     /**
-     * Record
+     * <p>
+     * The values returned in the record.
+     * </p>
      * 
      * @param values
-     *        Record
+     *        The values returned in the record.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultFrame.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultFrame.java
index 699b742669d9..0f0e318f42e0 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultFrame.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultFrame.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * Result Frame
+ * <p>
+ * The result set returned by a SQL statement.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ResultFrame" target="_top">AWS API
  *      Documentation</a>
@@ -26,15 +28,25 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ResultFrame implements Serializable, Cloneable, StructuredPojo {
 
-    /** ResultSet Metadata. */
+    /**
+     * <p>
+     * The records in the result set.
+     * </p>
+     */
     private java.util.List<Record> records;
-    /** ResultSet Metadata. */
+    /**
+     * <p>
+     * The result-set metadata in the result set.
+     * </p>
+     */
     private ResultSetMetadata resultSetMetadata;
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The records in the result set.
+     * </p>
      * 
-     * @return ResultSet Metadata.
+     * @return The records in the result set.
      */
 
     public java.util.List<Record> getRecords() {
@@ -42,10 +54,12 @@ public java.util.List<Record> getRecords() {
     }
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The records in the result set.
+     * </p>
      * 
      * @param records
-     *        ResultSet Metadata.
+     *        The records in the result set.
      */
 
     public void setRecords(java.util.Collection<Record> records) {
@@ -58,7 +72,9 @@ public void setRecords(java.util.Collection<Record> records) {
     }
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The records in the result set.
+     * </p>
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setRecords(java.util.Collection)} or {@link #withRecords(java.util.Collection)} if you want to override
@@ -66,7 +82,7 @@ public void setRecords(java.util.Collection<Record> records) {
      * </p>
      * 
      * @param records
-     *        ResultSet Metadata.
+     *        The records in the result set.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -81,10 +97,12 @@ public ResultFrame withRecords(Record... records) {
     }
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The records in the result set.
+     * </p>
      * 
      * @param records
-     *        ResultSet Metadata.
+     *        The records in the result set.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -94,10 +112,12 @@ public ResultFrame withRecords(java.util.Collection<Record> records) {
     }
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The result-set metadata in the result set.
+     * </p>
      * 
      * @param resultSetMetadata
-     *        ResultSet Metadata.
+     *        The result-set metadata in the result set.
      */
 
     public void setResultSetMetadata(ResultSetMetadata resultSetMetadata) {
@@ -105,9 +125,11 @@ public void setResultSetMetadata(ResultSetMetadata resultSetMetadata) {
     }
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The result-set metadata in the result set.
+     * </p>
      * 
-     * @return ResultSet Metadata.
+     * @return The result-set metadata in the result set.
      */
 
     public ResultSetMetadata getResultSetMetadata() {
@@ -115,10 +137,12 @@ public ResultSetMetadata getResultSetMetadata() {
     }
 
     /**
-     * ResultSet Metadata.
+     * <p>
+     * The result-set metadata in the result set.
+     * </p>
      * 
      * @param resultSetMetadata
-     *        ResultSet Metadata.
+     *        The result-set metadata in the result set.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultSetMetadata.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultSetMetadata.java
index 1e0a45e3b900..4d8db5311a48 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultSetMetadata.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ResultSetMetadata.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * List of columns and their types.
+ * <p>
+ * The metadata of the result set returned by a SQL statement.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/ResultSetMetadata" target="_top">AWS API
  *      Documentation</a>
@@ -26,16 +28,26 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ResultSetMetadata implements Serializable, Cloneable, StructuredPojo {
 
-    /** Number of columns */
+    /**
+     * <p>
+     * The number of columns in the result set.
+     * </p>
+     */
     private Long columnCount;
-    /** List of columns and their types */
+    /**
+     * <p>
+     * The metadata of the columns in the result set.
+     * </p>
+     */
     private java.util.List<ColumnMetadata> columnMetadata;
 
     /**
-     * Number of columns
+     * <p>
+     * The number of columns in the result set.
+     * </p>
      * 
      * @param columnCount
-     *        Number of columns
+     *        The number of columns in the result set.
      */
 
     public void setColumnCount(Long columnCount) {
@@ -43,9 +55,11 @@ public void setColumnCount(Long columnCount) {
     }
 
     /**
-     * Number of columns
+     * <p>
+     * The number of columns in the result set.
+     * </p>
      * 
-     * @return Number of columns
+     * @return The number of columns in the result set.
      */
 
     public Long getColumnCount() {
@@ -53,10 +67,12 @@ public Long getColumnCount() {
     }
 
     /**
-     * Number of columns
+     * <p>
+     * The number of columns in the result set.
+     * </p>
      * 
      * @param columnCount
-     *        Number of columns
+     *        The number of columns in the result set.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -66,9 +82,11 @@ public ResultSetMetadata withColumnCount(Long columnCount) {
     }
 
     /**
-     * List of columns and their types
+     * <p>
+     * The metadata of the columns in the result set.
+     * </p>
      * 
-     * @return List of columns and their types
+     * @return The metadata of the columns in the result set.
      */
 
     public java.util.List<ColumnMetadata> getColumnMetadata() {
@@ -76,10 +94,12 @@ public java.util.List<ColumnMetadata> getColumnMetadata() {
     }
 
     /**
-     * List of columns and their types
+     * <p>
+     * The metadata of the columns in the result set.
+     * </p>
      * 
      * @param columnMetadata
-     *        List of columns and their types
+     *        The metadata of the columns in the result set.
      */
 
     public void setColumnMetadata(java.util.Collection<ColumnMetadata> columnMetadata) {
@@ -92,7 +112,9 @@ public void setColumnMetadata(java.util.Collection<ColumnMetadata> columnMetadat
     }
 
     /**
-     * List of columns and their types
+     * <p>
+     * The metadata of the columns in the result set.
+     * </p>
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setColumnMetadata(java.util.Collection)} or {@link #withColumnMetadata(java.util.Collection)} if you want
@@ -100,7 +122,7 @@ public void setColumnMetadata(java.util.Collection<ColumnMetadata> columnMetadat
      * </p>
      * 
      * @param columnMetadata
-     *        List of columns and their types
+     *        The metadata of the columns in the result set.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -115,10 +137,12 @@ public ResultSetMetadata withColumnMetadata(ColumnMetadata... columnMetadata) {
     }
 
     /**
-     * List of columns and their types
+     * <p>
+     * The metadata of the columns in the result set.
+     * </p>
      * 
      * @param columnMetadata
-     *        List of columns and their types
+     *        The metadata of the columns in the result set.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/RollbackTransactionRequest.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/RollbackTransactionRequest.java
new file mode 100644
index 000000000000..38a91a0a011f
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/RollbackTransactionRequest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * <p>
+ * The request parameters represent the input of a request to perform a rollback of a transaction.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/RollbackTransaction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class RollbackTransactionRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     */
+    private String resourceArn;
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     */
+    private String secretArn;
+    /**
+     * <p>
+     * The identifier of the transaction to roll back.
+     * </p>
+     */
+    private String transactionId;
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public void setResourceArn(String resourceArn) {
+        this.resourceArn = resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @return The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     */
+
+    public String getResourceArn() {
+        return this.resourceArn;
+    }
+
+    /**
+     * <p>
+     * The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * </p>
+     * 
+     * @param resourceArn
+     *        The Amazon Resource Name (ARN) of the Aurora Serverless DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public RollbackTransactionRequest withResourceArn(String resourceArn) {
+        setResourceArn(resourceArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public void setSecretArn(String secretArn) {
+        this.secretArn = secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @return The name or ARN of the secret that enables access to the DB cluster.
+     */
+
+    public String getSecretArn() {
+        return this.secretArn;
+    }
+
+    /**
+     * <p>
+     * The name or ARN of the secret that enables access to the DB cluster.
+     * </p>
+     * 
+     * @param secretArn
+     *        The name or ARN of the secret that enables access to the DB cluster.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public RollbackTransactionRequest withSecretArn(String secretArn) {
+        setSecretArn(secretArn);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The identifier of the transaction to roll back.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of the transaction to roll back.
+     */
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of the transaction to roll back.
+     * </p>
+     * 
+     * @return The identifier of the transaction to roll back.
+     */
+
+    public String getTransactionId() {
+        return this.transactionId;
+    }
+
+    /**
+     * <p>
+     * The identifier of the transaction to roll back.
+     * </p>
+     * 
+     * @param transactionId
+     *        The identifier of the transaction to roll back.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public RollbackTransactionRequest withTransactionId(String transactionId) {
+        setTransactionId(transactionId);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getResourceArn() != null)
+            sb.append("ResourceArn: ").append(getResourceArn()).append(",");
+        if (getSecretArn() != null)
+            sb.append("SecretArn: ").append(getSecretArn()).append(",");
+        if (getTransactionId() != null)
+            sb.append("TransactionId: ").append(getTransactionId());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof RollbackTransactionRequest == false)
+            return false;
+        RollbackTransactionRequest other = (RollbackTransactionRequest) obj;
+        if (other.getResourceArn() == null ^ this.getResourceArn() == null)
+            return false;
+        if (other.getResourceArn() != null && other.getResourceArn().equals(this.getResourceArn()) == false)
+            return false;
+        if (other.getSecretArn() == null ^ this.getSecretArn() == null)
+            return false;
+        if (other.getSecretArn() != null && other.getSecretArn().equals(this.getSecretArn()) == false)
+            return false;
+        if (other.getTransactionId() == null ^ this.getTransactionId() == null)
+            return false;
+        if (other.getTransactionId() != null && other.getTransactionId().equals(this.getTransactionId()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getResourceArn() == null) ? 0 : getResourceArn().hashCode());
+        hashCode = prime * hashCode + ((getSecretArn() == null) ? 0 : getSecretArn().hashCode());
+        hashCode = prime * hashCode + ((getTransactionId() == null) ? 0 : getTransactionId().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public RollbackTransactionRequest clone() {
+        return (RollbackTransactionRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/RollbackTransactionResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/RollbackTransactionResult.java
new file mode 100644
index 000000000000..55fb1fd06426
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/RollbackTransactionResult.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The response elements represent the output of a request to perform a rollback of a transaction.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/RollbackTransaction" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class RollbackTransactionResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The status of the rollback operation.
+     * </p>
+     */
+    private String transactionStatus;
+
+    /**
+     * <p>
+     * The status of the rollback operation.
+     * </p>
+     * 
+     * @param transactionStatus
+     *        The status of the rollback operation.
+     */
+
+    public void setTransactionStatus(String transactionStatus) {
+        this.transactionStatus = transactionStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the rollback operation.
+     * </p>
+     * 
+     * @return The status of the rollback operation.
+     */
+
+    public String getTransactionStatus() {
+        return this.transactionStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the rollback operation.
+     * </p>
+     * 
+     * @param transactionStatus
+     *        The status of the rollback operation.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public RollbackTransactionResult withTransactionStatus(String transactionStatus) {
+        setTransactionStatus(transactionStatus);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getTransactionStatus() != null)
+            sb.append("TransactionStatus: ").append(getTransactionStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof RollbackTransactionResult == false)
+            return false;
+        RollbackTransactionResult other = (RollbackTransactionResult) obj;
+        if (other.getTransactionStatus() == null ^ this.getTransactionStatus() == null)
+            return false;
+        if (other.getTransactionStatus() != null && other.getTransactionStatus().equals(this.getTransactionStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getTransactionStatus() == null) ? 0 : getTransactionStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public RollbackTransactionResult clone() {
+        try {
+            return (RollbackTransactionResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ServiceUnavailableErrorException.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ServiceUnavailableErrorException.java
index cb474150f07c..dbb5e463af42 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ServiceUnavailableErrorException.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/ServiceUnavailableErrorException.java
@@ -15,7 +15,9 @@
 import javax.annotation.Generated;
 
 /**
- * Internal service unavailable error
+ * <p>
+ * The service specified by the <code>resourceArn</code> parameter is not available.
+ * </p>
  */
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class ServiceUnavailableErrorException extends com.amazonaws.services.rdsdata.model.AWSRDSDataException {
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlParameter.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlParameter.java
new file mode 100644
index 000000000000..e7f00a288789
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlParameter.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * A parameter used in a SQL statement.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/SqlParameter" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SqlParameter implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the parameter.
+     * </p>
+     */
+    private String name;
+    /**
+     * <p>
+     * The value of the parameter.
+     * </p>
+     */
+    private Field value;
+
+    /**
+     * <p>
+     * The name of the parameter.
+     * </p>
+     * 
+     * @param name
+     *        The name of the parameter.
+     */
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * <p>
+     * The name of the parameter.
+     * </p>
+     * 
+     * @return The name of the parameter.
+     */
+
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * <p>
+     * The name of the parameter.
+     * </p>
+     * 
+     * @param name
+     *        The name of the parameter.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SqlParameter withName(String name) {
+        setName(name);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The value of the parameter.
+     * </p>
+     * 
+     * @param value
+     *        The value of the parameter.
+     */
+
+    public void setValue(Field value) {
+        this.value = value;
+    }
+
+    /**
+     * <p>
+     * The value of the parameter.
+     * </p>
+     * 
+     * @return The value of the parameter.
+     */
+
+    public Field getValue() {
+        return this.value;
+    }
+
+    /**
+     * <p>
+     * The value of the parameter.
+     * </p>
+     * 
+     * @param value
+     *        The value of the parameter.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public SqlParameter withValue(Field value) {
+        setValue(value);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getName() != null)
+            sb.append("Name: ").append(getName()).append(",");
+        if (getValue() != null)
+            sb.append("Value: ").append(getValue());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof SqlParameter == false)
+            return false;
+        SqlParameter other = (SqlParameter) obj;
+        if (other.getName() == null ^ this.getName() == null)
+            return false;
+        if (other.getName() != null && other.getName().equals(this.getName()) == false)
+            return false;
+        if (other.getValue() == null ^ this.getValue() == null)
+            return false;
+        if (other.getValue() != null && other.getValue().equals(this.getValue()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode());
+        hashCode = prime * hashCode + ((getValue() == null) ? 0 : getValue().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public SqlParameter clone() {
+        try {
+            return (SqlParameter) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.rdsdata.model.transform.SqlParameterMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlStatementResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlStatementResult.java
index b88731073142..42763003bc9a 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlStatementResult.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/SqlStatementResult.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * SQL statement execution result
+ * <p>
+ * The result of a SQL statement.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/SqlStatementResult" target="_top">AWS API
  *      Documentation</a>
@@ -26,16 +28,26 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class SqlStatementResult implements Serializable, Cloneable, StructuredPojo {
 
-    /** Number of rows updated. */
+    /**
+     * <p>
+     * The number of records updated by a SQL statement.
+     * </p>
+     */
     private Long numberOfRecordsUpdated;
-    /** ResultFrame returned by executing the sql statement */
+    /**
+     * <p>
+     * The result set of the SQL statement.
+     * </p>
+     */
     private ResultFrame resultFrame;
 
     /**
-     * Number of rows updated.
+     * <p>
+     * The number of records updated by a SQL statement.
+     * </p>
      * 
      * @param numberOfRecordsUpdated
-     *        Number of rows updated.
+     *        The number of records updated by a SQL statement.
      */
 
     public void setNumberOfRecordsUpdated(Long numberOfRecordsUpdated) {
@@ -43,9 +55,11 @@ public void setNumberOfRecordsUpdated(Long numberOfRecordsUpdated) {
     }
 
     /**
-     * Number of rows updated.
+     * <p>
+     * The number of records updated by a SQL statement.
+     * </p>
      * 
-     * @return Number of rows updated.
+     * @return The number of records updated by a SQL statement.
      */
 
     public Long getNumberOfRecordsUpdated() {
@@ -53,10 +67,12 @@ public Long getNumberOfRecordsUpdated() {
     }
 
     /**
-     * Number of rows updated.
+     * <p>
+     * The number of records updated by a SQL statement.
+     * </p>
      * 
      * @param numberOfRecordsUpdated
-     *        Number of rows updated.
+     *        The number of records updated by a SQL statement.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -66,10 +82,12 @@ public SqlStatementResult withNumberOfRecordsUpdated(Long numberOfRecordsUpdated
     }
 
     /**
-     * ResultFrame returned by executing the sql statement
+     * <p>
+     * The result set of the SQL statement.
+     * </p>
      * 
      * @param resultFrame
-     *        ResultFrame returned by executing the sql statement
+     *        The result set of the SQL statement.
      */
 
     public void setResultFrame(ResultFrame resultFrame) {
@@ -77,9 +95,11 @@ public void setResultFrame(ResultFrame resultFrame) {
     }
 
     /**
-     * ResultFrame returned by executing the sql statement
+     * <p>
+     * The result set of the SQL statement.
+     * </p>
      * 
-     * @return ResultFrame returned by executing the sql statement
+     * @return The result set of the SQL statement.
      */
 
     public ResultFrame getResultFrame() {
@@ -87,10 +107,12 @@ public ResultFrame getResultFrame() {
     }
 
     /**
-     * ResultFrame returned by executing the sql statement
+     * <p>
+     * The result set of the SQL statement.
+     * </p>
      * 
      * @param resultFrame
-     *        ResultFrame returned by executing the sql statement
+     *        The result set of the SQL statement.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StatementTimeoutException.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StatementTimeoutException.java
new file mode 100644
index 000000000000..2ff03c4dd17f
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StatementTimeoutException.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import javax.annotation.Generated;
+
+/**
+ * <p>
+ * The execution of the SQL statement timed out.
+ * </p>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StatementTimeoutException extends com.amazonaws.services.rdsdata.model.AWSRDSDataException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * The database connection ID that executed the SQL statement.
+     * </p>
+     */
+    private Long dbConnectionId;
+
+    /**
+     * Constructs a new StatementTimeoutException with the specified error message.
+     *
+     * @param message
+     *        Describes the error encountered.
+     */
+    public StatementTimeoutException(String message) {
+        super(message);
+    }
+
+    /**
+     * <p>
+     * The database connection ID that executed the SQL statement.
+     * </p>
+     * 
+     * @param dbConnectionId
+     *        The database connection ID that executed the SQL statement.
+     */
+
+    @com.fasterxml.jackson.annotation.JsonProperty("dbConnectionId")
+    public void setDbConnectionId(Long dbConnectionId) {
+        this.dbConnectionId = dbConnectionId;
+    }
+
+    /**
+     * <p>
+     * The database connection ID that executed the SQL statement.
+     * </p>
+     * 
+     * @return The database connection ID that executed the SQL statement.
+     */
+
+    @com.fasterxml.jackson.annotation.JsonProperty("dbConnectionId")
+    public Long getDbConnectionId() {
+        return this.dbConnectionId;
+    }
+
+    /**
+     * <p>
+     * The database connection ID that executed the SQL statement.
+     * </p>
+     * 
+     * @param dbConnectionId
+     *        The database connection ID that executed the SQL statement.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StatementTimeoutException withDbConnectionId(Long dbConnectionId) {
+        setDbConnectionId(dbConnectionId);
+        return this;
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StructValue.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StructValue.java
index 9aa9315399f6..c7b064ce2ad7 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StructValue.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/StructValue.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * User Defined Type
+ * <p>
+ * A structure value returned by a call.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/StructValue" target="_top">AWS API
  *      Documentation</a>
@@ -26,13 +28,19 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class StructValue implements Serializable, Cloneable, StructuredPojo {
 
-    /** Struct or UDT */
+    /**
+     * <p>
+     * The attributes returned in the record.
+     * </p>
+     */
     private java.util.List<Value> attributes;
 
     /**
-     * Struct or UDT
+     * <p>
+     * The attributes returned in the record.
+     * </p>
      * 
-     * @return Struct or UDT
+     * @return The attributes returned in the record.
      */
 
     public java.util.List<Value> getAttributes() {
@@ -40,10 +48,12 @@ public java.util.List<Value> getAttributes() {
     }
 
     /**
-     * Struct or UDT
+     * <p>
+     * The attributes returned in the record.
+     * </p>
      * 
      * @param attributes
-     *        Struct or UDT
+     *        The attributes returned in the record.
      */
 
     public void setAttributes(java.util.Collection<Value> attributes) {
@@ -56,7 +66,9 @@ public void setAttributes(java.util.Collection<Value> attributes) {
     }
 
     /**
-     * Struct or UDT
+     * <p>
+     * The attributes returned in the record.
+     * </p>
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setAttributes(java.util.Collection)} or {@link #withAttributes(java.util.Collection)} if you want to
@@ -64,7 +76,7 @@ public void setAttributes(java.util.Collection<Value> attributes) {
      * </p>
      * 
      * @param attributes
-     *        Struct or UDT
+     *        The attributes returned in the record.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -79,10 +91,12 @@ public StructValue withAttributes(Value... attributes) {
     }
 
     /**
-     * Struct or UDT
+     * <p>
+     * The attributes returned in the record.
+     * </p>
      * 
      * @param attributes
-     *        Struct or UDT
+     *        The attributes returned in the record.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/UpdateResult.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/UpdateResult.java
new file mode 100644
index 000000000000..77f954ddd5cc
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/UpdateResult.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * The response elements represent the results of an update.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/UpdateResult" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateResult implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     */
+    private java.util.List<Field> generatedFields;
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * 
+     * @return Values for fields generated during the request.
+     */
+
+    public java.util.List<Field> getGeneratedFields() {
+        return generatedFields;
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * 
+     * @param generatedFields
+     *        Values for fields generated during the request.
+     */
+
+    public void setGeneratedFields(java.util.Collection<Field> generatedFields) {
+        if (generatedFields == null) {
+            this.generatedFields = null;
+            return;
+        }
+
+        this.generatedFields = new java.util.ArrayList<Field>(generatedFields);
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setGeneratedFields(java.util.Collection)} or {@link #withGeneratedFields(java.util.Collection)} if you
+     * want to override the existing values.
+     * </p>
+     * 
+     * @param generatedFields
+     *        Values for fields generated during the request.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateResult withGeneratedFields(Field... generatedFields) {
+        if (this.generatedFields == null) {
+            setGeneratedFields(new java.util.ArrayList<Field>(generatedFields.length));
+        }
+        for (Field ele : generatedFields) {
+            this.generatedFields.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * Values for fields generated during the request.
+     * </p>
+     * 
+     * @param generatedFields
+     *        Values for fields generated during the request.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public UpdateResult withGeneratedFields(java.util.Collection<Field> generatedFields) {
+        setGeneratedFields(generatedFields);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getGeneratedFields() != null)
+            sb.append("GeneratedFields: ").append(getGeneratedFields());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof UpdateResult == false)
+            return false;
+        UpdateResult other = (UpdateResult) obj;
+        if (other.getGeneratedFields() == null ^ this.getGeneratedFields() == null)
+            return false;
+        if (other.getGeneratedFields() != null && other.getGeneratedFields().equals(this.getGeneratedFields()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getGeneratedFields() == null) ? 0 : getGeneratedFields().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public UpdateResult clone() {
+        try {
+            return (UpdateResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.rdsdata.model.transform.UpdateResultMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Value.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Value.java
index 3346e40cbc42..d1156760eb5d 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Value.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/Value.java
@@ -18,7 +18,9 @@
 import com.amazonaws.protocol.ProtocolMarshaller;
 
 /**
- * Column value
+ * <p>
+ * Contains the value of a column.
+ * </p>
  * 
  * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/rds-data-2018-08-01/Value" target="_top">AWS API
  *      Documentation</a>
@@ -26,31 +28,73 @@
 @Generated("com.amazonaws:aws-java-sdk-code-generator")
 public class Value implements Serializable, Cloneable, StructuredPojo {
 
-    /** Arbitrarily nested arrays */
+    /**
+     * <p>
+     * An array of column values.
+     * </p>
+     */
     private java.util.List<Value> arrayValues;
-    /** Long value */
+    /**
+     * <p>
+     * A value for a column of big integer data type.
+     * </p>
+     */
     private Long bigIntValue;
-    /** Bit value */
+    /**
+     * <p>
+     * A value for a column of BIT data type.
+     * </p>
+     */
     private Boolean bitValue;
-    /** Blob value */
+    /**
+     * <p>
+     * A value for a column of BLOB data type.
+     * </p>
+     */
     private java.nio.ByteBuffer blobValue;
-    /** Double value */
+    /**
+     * <p>
+     * A value for a column of double data type.
+     * </p>
+     */
     private Double doubleValue;
-    /** Integer value */
+    /**
+     * <p>
+     * A value for a column of integer data type.
+     * </p>
+     */
     private Integer intValue;
-    /** Is column null */
+    /**
+     * <p>
+     * A NULL value.
+     * </p>
+     */
     private Boolean isNull;
-    /** Float value */
+    /**
+     * <p>
+     * A value for a column of real data type.
+     * </p>
+     */
     private Float realValue;
-    /** String value */
+    /**
+     * <p>
+     * A value for a column of string data type.
+     * </p>
+     */
     private String stringValue;
-    /** Struct or UDT */
+    /**
+     * <p>
+     * A value for a column of STRUCT data type.
+     * </p>
+     */
     private StructValue structValue;
 
     /**
-     * Arbitrarily nested arrays
+     * <p>
+     * An array of column values.
+     * </p>
      * 
-     * @return Arbitrarily nested arrays
+     * @return An array of column values.
      */
 
     public java.util.List<Value> getArrayValues() {
@@ -58,10 +102,12 @@ public java.util.List<Value> getArrayValues() {
     }
 
     /**
-     * Arbitrarily nested arrays
+     * <p>
+     * An array of column values.
+     * </p>
      * 
      * @param arrayValues
-     *        Arbitrarily nested arrays
+     *        An array of column values.
      */
 
     public void setArrayValues(java.util.Collection<Value> arrayValues) {
@@ -74,7 +120,9 @@ public void setArrayValues(java.util.Collection<Value> arrayValues) {
     }
 
     /**
-     * Arbitrarily nested arrays
+     * <p>
+     * An array of column values.
+     * </p>
      * <p>
      * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
      * {@link #setArrayValues(java.util.Collection)} or {@link #withArrayValues(java.util.Collection)} if you want to
@@ -82,7 +130,7 @@ public void setArrayValues(java.util.Collection<Value> arrayValues) {
      * </p>
      * 
      * @param arrayValues
-     *        Arbitrarily nested arrays
+     *        An array of column values.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -97,10 +145,12 @@ public Value withArrayValues(Value... arrayValues) {
     }
 
     /**
-     * Arbitrarily nested arrays
+     * <p>
+     * An array of column values.
+     * </p>
      * 
      * @param arrayValues
-     *        Arbitrarily nested arrays
+     *        An array of column values.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -110,10 +160,12 @@ public Value withArrayValues(java.util.Collection<Value> arrayValues) {
     }
 
     /**
-     * Long value
+     * <p>
+     * A value for a column of big integer data type.
+     * </p>
      * 
      * @param bigIntValue
-     *        Long value
+     *        A value for a column of big integer data type.
      */
 
     public void setBigIntValue(Long bigIntValue) {
@@ -121,9 +173,11 @@ public void setBigIntValue(Long bigIntValue) {
     }
 
     /**
-     * Long value
+     * <p>
+     * A value for a column of big integer data type.
+     * </p>
      * 
-     * @return Long value
+     * @return A value for a column of big integer data type.
      */
 
     public Long getBigIntValue() {
@@ -131,10 +185,12 @@ public Long getBigIntValue() {
     }
 
     /**
-     * Long value
+     * <p>
+     * A value for a column of big integer data type.
+     * </p>
      * 
      * @param bigIntValue
-     *        Long value
+     *        A value for a column of big integer data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -144,10 +200,12 @@ public Value withBigIntValue(Long bigIntValue) {
     }
 
     /**
-     * Bit value
+     * <p>
+     * A value for a column of BIT data type.
+     * </p>
      * 
      * @param bitValue
-     *        Bit value
+     *        A value for a column of BIT data type.
      */
 
     public void setBitValue(Boolean bitValue) {
@@ -155,9 +213,11 @@ public void setBitValue(Boolean bitValue) {
     }
 
     /**
-     * Bit value
+     * <p>
+     * A value for a column of BIT data type.
+     * </p>
      * 
-     * @return Bit value
+     * @return A value for a column of BIT data type.
      */
 
     public Boolean getBitValue() {
@@ -165,10 +225,12 @@ public Boolean getBitValue() {
     }
 
     /**
-     * Bit value
+     * <p>
+     * A value for a column of BIT data type.
+     * </p>
      * 
      * @param bitValue
-     *        Bit value
+     *        A value for a column of BIT data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -178,9 +240,11 @@ public Value withBitValue(Boolean bitValue) {
     }
 
     /**
-     * Bit value
+     * <p>
+     * A value for a column of BIT data type.
+     * </p>
      * 
-     * @return Bit value
+     * @return A value for a column of BIT data type.
      */
 
     public Boolean isBitValue() {
@@ -188,7 +252,9 @@ public Boolean isBitValue() {
     }
 
     /**
-     * Blob value
+     * <p>
+     * A value for a column of BLOB data type.
+     * </p>
      * <p>
      * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
      * Users of the SDK should not perform Base64 encoding on this field.
@@ -201,7 +267,7 @@ public Boolean isBitValue() {
      * </p>
      * 
      * @param blobValue
-     *        Blob value
+     *        A value for a column of BLOB data type.
      */
 
     public void setBlobValue(java.nio.ByteBuffer blobValue) {
@@ -209,7 +275,9 @@ public void setBlobValue(java.nio.ByteBuffer blobValue) {
     }
 
     /**
-     * Blob value
+     * <p>
+     * A value for a column of BLOB data type.
+     * </p>
      * <p>
      * {@code ByteBuffer}s are stateful. Calling their {@code get} methods changes their {@code position}. We recommend
      * using {@link java.nio.ByteBuffer#asReadOnlyBuffer()} to create a read-only view of the buffer with an independent
@@ -218,7 +286,7 @@ public void setBlobValue(java.nio.ByteBuffer blobValue) {
      * {@code position}.
      * </p>
      * 
-     * @return Blob value
+     * @return A value for a column of BLOB data type.
      */
 
     public java.nio.ByteBuffer getBlobValue() {
@@ -226,7 +294,9 @@ public java.nio.ByteBuffer getBlobValue() {
     }
 
     /**
-     * Blob value
+     * <p>
+     * A value for a column of BLOB data type.
+     * </p>
      * <p>
      * The AWS SDK for Java performs a Base64 encoding on this field before sending this request to the AWS service.
      * Users of the SDK should not perform Base64 encoding on this field.
@@ -239,7 +309,7 @@ public java.nio.ByteBuffer getBlobValue() {
      * </p>
      * 
      * @param blobValue
-     *        Blob value
+     *        A value for a column of BLOB data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -249,10 +319,12 @@ public Value withBlobValue(java.nio.ByteBuffer blobValue) {
     }
 
     /**
-     * Double value
+     * <p>
+     * A value for a column of double data type.
+     * </p>
      * 
      * @param doubleValue
-     *        Double value
+     *        A value for a column of double data type.
      */
 
     public void setDoubleValue(Double doubleValue) {
@@ -260,9 +332,11 @@ public void setDoubleValue(Double doubleValue) {
     }
 
     /**
-     * Double value
+     * <p>
+     * A value for a column of double data type.
+     * </p>
      * 
-     * @return Double value
+     * @return A value for a column of double data type.
      */
 
     public Double getDoubleValue() {
@@ -270,10 +344,12 @@ public Double getDoubleValue() {
     }
 
     /**
-     * Double value
+     * <p>
+     * A value for a column of double data type.
+     * </p>
      * 
      * @param doubleValue
-     *        Double value
+     *        A value for a column of double data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -283,10 +359,12 @@ public Value withDoubleValue(Double doubleValue) {
     }
 
     /**
-     * Integer value
+     * <p>
+     * A value for a column of integer data type.
+     * </p>
      * 
      * @param intValue
-     *        Integer value
+     *        A value for a column of integer data type.
      */
 
     public void setIntValue(Integer intValue) {
@@ -294,9 +372,11 @@ public void setIntValue(Integer intValue) {
     }
 
     /**
-     * Integer value
+     * <p>
+     * A value for a column of integer data type.
+     * </p>
      * 
-     * @return Integer value
+     * @return A value for a column of integer data type.
      */
 
     public Integer getIntValue() {
@@ -304,10 +384,12 @@ public Integer getIntValue() {
     }
 
     /**
-     * Integer value
+     * <p>
+     * A value for a column of integer data type.
+     * </p>
      * 
      * @param intValue
-     *        Integer value
+     *        A value for a column of integer data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -317,10 +399,12 @@ public Value withIntValue(Integer intValue) {
     }
 
     /**
-     * Is column null
+     * <p>
+     * A NULL value.
+     * </p>
      * 
      * @param isNull
-     *        Is column null
+     *        A NULL value.
      */
 
     public void setIsNull(Boolean isNull) {
@@ -328,9 +412,11 @@ public void setIsNull(Boolean isNull) {
     }
 
     /**
-     * Is column null
+     * <p>
+     * A NULL value.
+     * </p>
      * 
-     * @return Is column null
+     * @return A NULL value.
      */
 
     public Boolean getIsNull() {
@@ -338,10 +424,12 @@ public Boolean getIsNull() {
     }
 
     /**
-     * Is column null
+     * <p>
+     * A NULL value.
+     * </p>
      * 
      * @param isNull
-     *        Is column null
+     *        A NULL value.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -351,9 +439,11 @@ public Value withIsNull(Boolean isNull) {
     }
 
     /**
-     * Is column null
+     * <p>
+     * A NULL value.
+     * </p>
      * 
-     * @return Is column null
+     * @return A NULL value.
      */
 
     public Boolean isNull() {
@@ -361,10 +451,12 @@ public Boolean isNull() {
     }
 
     /**
-     * Float value
+     * <p>
+     * A value for a column of real data type.
+     * </p>
      * 
      * @param realValue
-     *        Float value
+     *        A value for a column of real data type.
      */
 
     public void setRealValue(Float realValue) {
@@ -372,9 +464,11 @@ public void setRealValue(Float realValue) {
     }
 
     /**
-     * Float value
+     * <p>
+     * A value for a column of real data type.
+     * </p>
      * 
-     * @return Float value
+     * @return A value for a column of real data type.
      */
 
     public Float getRealValue() {
@@ -382,10 +476,12 @@ public Float getRealValue() {
     }
 
     /**
-     * Float value
+     * <p>
+     * A value for a column of real data type.
+     * </p>
      * 
      * @param realValue
-     *        Float value
+     *        A value for a column of real data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -395,10 +491,12 @@ public Value withRealValue(Float realValue) {
     }
 
     /**
-     * String value
+     * <p>
+     * A value for a column of string data type.
+     * </p>
      * 
      * @param stringValue
-     *        String value
+     *        A value for a column of string data type.
      */
 
     public void setStringValue(String stringValue) {
@@ -406,9 +504,11 @@ public void setStringValue(String stringValue) {
     }
 
     /**
-     * String value
+     * <p>
+     * A value for a column of string data type.
+     * </p>
      * 
-     * @return String value
+     * @return A value for a column of string data type.
      */
 
     public String getStringValue() {
@@ -416,10 +516,12 @@ public String getStringValue() {
     }
 
     /**
-     * String value
+     * <p>
+     * A value for a column of string data type.
+     * </p>
      * 
      * @param stringValue
-     *        String value
+     *        A value for a column of string data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
@@ -429,10 +531,12 @@ public Value withStringValue(String stringValue) {
     }
 
     /**
-     * Struct or UDT
+     * <p>
+     * A value for a column of STRUCT data type.
+     * </p>
      * 
      * @param structValue
-     *        Struct or UDT
+     *        A value for a column of STRUCT data type.
      */
 
     public void setStructValue(StructValue structValue) {
@@ -440,9 +544,11 @@ public void setStructValue(StructValue structValue) {
     }
 
     /**
-     * Struct or UDT
+     * <p>
+     * A value for a column of STRUCT data type.
+     * </p>
      * 
-     * @return Struct or UDT
+     * @return A value for a column of STRUCT data type.
      */
 
     public StructValue getStructValue() {
@@ -450,10 +556,12 @@ public StructValue getStructValue() {
     }
 
     /**
-     * Struct or UDT
+     * <p>
+     * A value for a column of STRUCT data type.
+     * </p>
      * 
      * @param structValue
-     *        Struct or UDT
+     *        A value for a column of STRUCT data type.
      * @return Returns a reference to this object so that method calls can be chained together.
      */
 
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementRequestMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementRequestMarshaller.java
new file mode 100644
index 000000000000..7bc1e3bf8041
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementRequestMarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchExecuteStatementRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchExecuteStatementRequestMarshaller {
+
+    private static final MarshallingInfo<String> DATABASE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("database").build();
+    private static final MarshallingInfo<List> PARAMETERSETS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("parameterSets").build();
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<String> SCHEMA_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("schema").build();
+    private static final MarshallingInfo<String> SECRETARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("secretArn").build();
+    private static final MarshallingInfo<String> SQL_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("sql").build();
+    private static final MarshallingInfo<String> TRANSACTIONID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("transactionId").build();
+
+    private static final BatchExecuteStatementRequestMarshaller instance = new BatchExecuteStatementRequestMarshaller();
+
+    public static BatchExecuteStatementRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BatchExecuteStatementRequest batchExecuteStatementRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (batchExecuteStatementRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getDatabase(), DATABASE_BINDING);
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getParameterSets(), PARAMETERSETS_BINDING);
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getSchema(), SCHEMA_BINDING);
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getSecretArn(), SECRETARN_BINDING);
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getSql(), SQL_BINDING);
+            protocolMarshaller.marshall(batchExecuteStatementRequest.getTransactionId(), TRANSACTIONID_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementRequestProtocolMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..b43aeb50a5fa
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BatchExecuteStatementRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BatchExecuteStatementRequestProtocolMarshaller implements Marshaller<Request<BatchExecuteStatementRequest>, BatchExecuteStatementRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/BatchExecute")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSRDSData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public BatchExecuteStatementRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<BatchExecuteStatementRequest> marshall(BatchExecuteStatementRequest batchExecuteStatementRequest) {
+
+        if (batchExecuteStatementRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<BatchExecuteStatementRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    batchExecuteStatementRequest);
+
+            protocolMarshaller.startMarshalling();
+            BatchExecuteStatementRequestMarshaller.getInstance().marshall(batchExecuteStatementRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementResultJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..18ff8e4010e8
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BatchExecuteStatementResultJsonUnmarshaller.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BatchExecuteStatementResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BatchExecuteStatementResultJsonUnmarshaller implements Unmarshaller<BatchExecuteStatementResult, JsonUnmarshallerContext> {
+
+    public BatchExecuteStatementResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BatchExecuteStatementResult batchExecuteStatementResult = new BatchExecuteStatementResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return batchExecuteStatementResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("updateResults", targetDepth)) {
+                    context.nextToken();
+                    batchExecuteStatementResult.setUpdateResults(new ListUnmarshaller<UpdateResult>(UpdateResultJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return batchExecuteStatementResult;
+    }
+
+    private static BatchExecuteStatementResultJsonUnmarshaller instance;
+
+    public static BatchExecuteStatementResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BatchExecuteStatementResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionRequestMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionRequestMarshaller.java
new file mode 100644
index 000000000000..dee335ac6972
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionRequestMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BeginTransactionRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BeginTransactionRequestMarshaller {
+
+    private static final MarshallingInfo<String> DATABASE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("database").build();
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<String> SCHEMA_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("schema").build();
+    private static final MarshallingInfo<String> SECRETARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("secretArn").build();
+
+    private static final BeginTransactionRequestMarshaller instance = new BeginTransactionRequestMarshaller();
+
+    public static BeginTransactionRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(BeginTransactionRequest beginTransactionRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (beginTransactionRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(beginTransactionRequest.getDatabase(), DATABASE_BINDING);
+            protocolMarshaller.marshall(beginTransactionRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(beginTransactionRequest.getSchema(), SCHEMA_BINDING);
+            protocolMarshaller.marshall(beginTransactionRequest.getSecretArn(), SECRETARN_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionRequestProtocolMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..9c7ac1509d94
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * BeginTransactionRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class BeginTransactionRequestProtocolMarshaller implements Marshaller<Request<BeginTransactionRequest>, BeginTransactionRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/BeginTransaction")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSRDSData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public BeginTransactionRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<BeginTransactionRequest> marshall(BeginTransactionRequest beginTransactionRequest) {
+
+        if (beginTransactionRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<BeginTransactionRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    beginTransactionRequest);
+
+            protocolMarshaller.startMarshalling();
+            BeginTransactionRequestMarshaller.getInstance().marshall(beginTransactionRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionResultJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..2dfebb6ab593
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/BeginTransactionResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * BeginTransactionResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class BeginTransactionResultJsonUnmarshaller implements Unmarshaller<BeginTransactionResult, JsonUnmarshallerContext> {
+
+    public BeginTransactionResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        BeginTransactionResult beginTransactionResult = new BeginTransactionResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return beginTransactionResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("transactionId", targetDepth)) {
+                    context.nextToken();
+                    beginTransactionResult.setTransactionId(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return beginTransactionResult;
+    }
+
+    private static BeginTransactionResultJsonUnmarshaller instance;
+
+    public static BeginTransactionResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new BeginTransactionResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionRequestMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionRequestMarshaller.java
new file mode 100644
index 000000000000..c5a13720b415
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CommitTransactionRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CommitTransactionRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<String> SECRETARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("secretArn").build();
+    private static final MarshallingInfo<String> TRANSACTIONID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("transactionId").build();
+
+    private static final CommitTransactionRequestMarshaller instance = new CommitTransactionRequestMarshaller();
+
+    public static CommitTransactionRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(CommitTransactionRequest commitTransactionRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (commitTransactionRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(commitTransactionRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(commitTransactionRequest.getSecretArn(), SECRETARN_BINDING);
+            protocolMarshaller.marshall(commitTransactionRequest.getTransactionId(), TRANSACTIONID_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionRequestProtocolMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..ce42fa44cc20
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * CommitTransactionRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class CommitTransactionRequestProtocolMarshaller implements Marshaller<Request<CommitTransactionRequest>, CommitTransactionRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/CommitTransaction")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSRDSData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public CommitTransactionRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<CommitTransactionRequest> marshall(CommitTransactionRequest commitTransactionRequest) {
+
+        if (commitTransactionRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<CommitTransactionRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    commitTransactionRequest);
+
+            protocolMarshaller.startMarshalling();
+            CommitTransactionRequestMarshaller.getInstance().marshall(commitTransactionRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionResultJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..7020da2abaf0
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/CommitTransactionResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * CommitTransactionResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class CommitTransactionResultJsonUnmarshaller implements Unmarshaller<CommitTransactionResult, JsonUnmarshallerContext> {
+
+    public CommitTransactionResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        CommitTransactionResult commitTransactionResult = new CommitTransactionResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return commitTransactionResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("transactionStatus", targetDepth)) {
+                    context.nextToken();
+                    commitTransactionResult.setTransactionStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return commitTransactionResult;
+    }
+
+    private static CommitTransactionResultJsonUnmarshaller instance;
+
+    public static CommitTransactionResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new CommitTransactionResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementRequestMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementRequestMarshaller.java
new file mode 100644
index 000000000000..e8c23c5d4357
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementRequestMarshaller.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ExecuteStatementRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ExecuteStatementRequestMarshaller {
+
+    private static final MarshallingInfo<Boolean> CONTINUEAFTERTIMEOUT_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("continueAfterTimeout").build();
+    private static final MarshallingInfo<String> DATABASE_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("database").build();
+    private static final MarshallingInfo<Boolean> INCLUDERESULTMETADATA_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("includeResultMetadata").build();
+    private static final MarshallingInfo<List> PARAMETERS_BINDING = MarshallingInfo.builder(MarshallingType.LIST).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("parameters").build();
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<String> SCHEMA_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("schema").build();
+    private static final MarshallingInfo<String> SECRETARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("secretArn").build();
+    private static final MarshallingInfo<String> SQL_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("sql").build();
+    private static final MarshallingInfo<String> TRANSACTIONID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("transactionId").build();
+
+    private static final ExecuteStatementRequestMarshaller instance = new ExecuteStatementRequestMarshaller();
+
+    public static ExecuteStatementRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ExecuteStatementRequest executeStatementRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (executeStatementRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(executeStatementRequest.getContinueAfterTimeout(), CONTINUEAFTERTIMEOUT_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getDatabase(), DATABASE_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getIncludeResultMetadata(), INCLUDERESULTMETADATA_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getParameters(), PARAMETERS_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getSchema(), SCHEMA_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getSecretArn(), SECRETARN_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getSql(), SQL_BINDING);
+            protocolMarshaller.marshall(executeStatementRequest.getTransactionId(), TRANSACTIONID_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementRequestProtocolMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..3a774e211b48
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ExecuteStatementRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ExecuteStatementRequestProtocolMarshaller implements Marshaller<Request<ExecuteStatementRequest>, ExecuteStatementRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/Execute")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSRDSData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ExecuteStatementRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ExecuteStatementRequest> marshall(ExecuteStatementRequest executeStatementRequest) {
+
+        if (executeStatementRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ExecuteStatementRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    executeStatementRequest);
+
+            protocolMarshaller.startMarshalling();
+            ExecuteStatementRequestMarshaller.getInstance().marshall(executeStatementRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementResultJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..44262626f843
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/ExecuteStatementResultJsonUnmarshaller.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ExecuteStatementResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ExecuteStatementResultJsonUnmarshaller implements Unmarshaller<ExecuteStatementResult, JsonUnmarshallerContext> {
+
+    public ExecuteStatementResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ExecuteStatementResult executeStatementResult = new ExecuteStatementResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return executeStatementResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("columnMetadata", targetDepth)) {
+                    context.nextToken();
+                    executeStatementResult.setColumnMetadata(new ListUnmarshaller<ColumnMetadata>(ColumnMetadataJsonUnmarshaller.getInstance())
+                            .unmarshall(context));
+                }
+                if (context.testExpression("generatedFields", targetDepth)) {
+                    context.nextToken();
+                    executeStatementResult.setGeneratedFields(new ListUnmarshaller<Field>(FieldJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("numberOfRecordsUpdated", targetDepth)) {
+                    context.nextToken();
+                    executeStatementResult.setNumberOfRecordsUpdated(context.getUnmarshaller(Long.class).unmarshall(context));
+                }
+                if (context.testExpression("records", targetDepth)) {
+                    context.nextToken();
+                    executeStatementResult.setRecords(new ListUnmarshaller<java.util.List<Field>>(new ListUnmarshaller<Field>(FieldJsonUnmarshaller
+                            .getInstance())).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return executeStatementResult;
+    }
+
+    private static ExecuteStatementResultJsonUnmarshaller instance;
+
+    public static ExecuteStatementResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ExecuteStatementResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/FieldJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/FieldJsonUnmarshaller.java
new file mode 100644
index 000000000000..3adbb024c5ce
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/FieldJsonUnmarshaller.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+import java.nio.ByteBuffer;
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * Field JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class FieldJsonUnmarshaller implements Unmarshaller<Field, JsonUnmarshallerContext> {
+
+    public Field unmarshall(JsonUnmarshallerContext context) throws Exception {
+        Field field = new Field();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("blobValue", targetDepth)) {
+                    context.nextToken();
+                    field.setBlobValue(context.getUnmarshaller(java.nio.ByteBuffer.class).unmarshall(context));
+                }
+                if (context.testExpression("booleanValue", targetDepth)) {
+                    context.nextToken();
+                    field.setBooleanValue(context.getUnmarshaller(Boolean.class).unmarshall(context));
+                }
+                if (context.testExpression("doubleValue", targetDepth)) {
+                    context.nextToken();
+                    field.setDoubleValue(context.getUnmarshaller(Double.class).unmarshall(context));
+                }
+                if (context.testExpression("isNull", targetDepth)) {
+                    context.nextToken();
+                    field.setIsNull(context.getUnmarshaller(Boolean.class).unmarshall(context));
+                }
+                if (context.testExpression("longValue", targetDepth)) {
+                    context.nextToken();
+                    field.setLongValue(context.getUnmarshaller(Long.class).unmarshall(context));
+                }
+                if (context.testExpression("stringValue", targetDepth)) {
+                    context.nextToken();
+                    field.setStringValue(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return field;
+    }
+
+    private static FieldJsonUnmarshaller instance;
+
+    public static FieldJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new FieldJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/FieldMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/FieldMarshaller.java
new file mode 100644
index 000000000000..a6338bc463b8
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/FieldMarshaller.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * FieldMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class FieldMarshaller {
+
+    private static final MarshallingInfo<java.nio.ByteBuffer> BLOBVALUE_BINDING = MarshallingInfo.builder(MarshallingType.BYTE_BUFFER)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("blobValue").build();
+    private static final MarshallingInfo<Boolean> BOOLEANVALUE_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("booleanValue").build();
+    private static final MarshallingInfo<Double> DOUBLEVALUE_BINDING = MarshallingInfo.builder(MarshallingType.DOUBLE)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("doubleValue").build();
+    private static final MarshallingInfo<Boolean> ISNULL_BINDING = MarshallingInfo.builder(MarshallingType.BOOLEAN).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("isNull").build();
+    private static final MarshallingInfo<Long> LONGVALUE_BINDING = MarshallingInfo.builder(MarshallingType.LONG).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("longValue").build();
+    private static final MarshallingInfo<String> STRINGVALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("stringValue").build();
+
+    private static final FieldMarshaller instance = new FieldMarshaller();
+
+    public static FieldMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(Field field, ProtocolMarshaller protocolMarshaller) {
+
+        if (field == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(field.getBlobValue(), BLOBVALUE_BINDING);
+            protocolMarshaller.marshall(field.getBooleanValue(), BOOLEANVALUE_BINDING);
+            protocolMarshaller.marshall(field.getDoubleValue(), DOUBLEVALUE_BINDING);
+            protocolMarshaller.marshall(field.getIsNull(), ISNULL_BINDING);
+            protocolMarshaller.marshall(field.getLongValue(), LONGVALUE_BINDING);
+            protocolMarshaller.marshall(field.getStringValue(), STRINGVALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionRequestMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionRequestMarshaller.java
new file mode 100644
index 000000000000..e8113b3d55c5
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionRequestMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * RollbackTransactionRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class RollbackTransactionRequestMarshaller {
+
+    private static final MarshallingInfo<String> RESOURCEARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("resourceArn").build();
+    private static final MarshallingInfo<String> SECRETARN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("secretArn").build();
+    private static final MarshallingInfo<String> TRANSACTIONID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("transactionId").build();
+
+    private static final RollbackTransactionRequestMarshaller instance = new RollbackTransactionRequestMarshaller();
+
+    public static RollbackTransactionRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(RollbackTransactionRequest rollbackTransactionRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (rollbackTransactionRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(rollbackTransactionRequest.getResourceArn(), RESOURCEARN_BINDING);
+            protocolMarshaller.marshall(rollbackTransactionRequest.getSecretArn(), SECRETARN_BINDING);
+            protocolMarshaller.marshall(rollbackTransactionRequest.getTransactionId(), TRANSACTIONID_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionRequestProtocolMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..63c458336cb9
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionRequestProtocolMarshaller.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * RollbackTransactionRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class RollbackTransactionRequestProtocolMarshaller implements Marshaller<Request<RollbackTransactionRequest>, RollbackTransactionRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.REST_JSON).requestUri("/RollbackTransaction")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true).serviceName("AWSRDSData").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public RollbackTransactionRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<RollbackTransactionRequest> marshall(RollbackTransactionRequest rollbackTransactionRequest) {
+
+        if (rollbackTransactionRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<RollbackTransactionRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(SDK_OPERATION_BINDING,
+                    rollbackTransactionRequest);
+
+            protocolMarshaller.startMarshalling();
+            RollbackTransactionRequestMarshaller.getInstance().marshall(rollbackTransactionRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionResultJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..7a16ff4ae061
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/RollbackTransactionResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * RollbackTransactionResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class RollbackTransactionResultJsonUnmarshaller implements Unmarshaller<RollbackTransactionResult, JsonUnmarshallerContext> {
+
+    public RollbackTransactionResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        RollbackTransactionResult rollbackTransactionResult = new RollbackTransactionResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return rollbackTransactionResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("transactionStatus", targetDepth)) {
+                    context.nextToken();
+                    rollbackTransactionResult.setTransactionStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return rollbackTransactionResult;
+    }
+
+    private static RollbackTransactionResultJsonUnmarshaller instance;
+
+    public static RollbackTransactionResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new RollbackTransactionResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/SqlParameterJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/SqlParameterJsonUnmarshaller.java
new file mode 100644
index 000000000000..ed167268efb7
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/SqlParameterJsonUnmarshaller.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * SqlParameter JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class SqlParameterJsonUnmarshaller implements Unmarshaller<SqlParameter, JsonUnmarshallerContext> {
+
+    public SqlParameter unmarshall(JsonUnmarshallerContext context) throws Exception {
+        SqlParameter sqlParameter = new SqlParameter();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("name", targetDepth)) {
+                    context.nextToken();
+                    sqlParameter.setName(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("value", targetDepth)) {
+                    context.nextToken();
+                    sqlParameter.setValue(FieldJsonUnmarshaller.getInstance().unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return sqlParameter;
+    }
+
+    private static SqlParameterJsonUnmarshaller instance;
+
+    public static SqlParameterJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new SqlParameterJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/SqlParameterMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/SqlParameterMarshaller.java
new file mode 100644
index 000000000000..425a554a30b1
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/SqlParameterMarshaller.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * SqlParameterMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class SqlParameterMarshaller {
+
+    private static final MarshallingInfo<String> NAME_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("name").build();
+    private static final MarshallingInfo<StructuredPojo> VALUE_BINDING = MarshallingInfo.builder(MarshallingType.STRUCTURED)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("value").build();
+
+    private static final SqlParameterMarshaller instance = new SqlParameterMarshaller();
+
+    public static SqlParameterMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(SqlParameter sqlParameter, ProtocolMarshaller protocolMarshaller) {
+
+        if (sqlParameter == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(sqlParameter.getName(), NAME_BINDING);
+            protocolMarshaller.marshall(sqlParameter.getValue(), VALUE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/UpdateResultJsonUnmarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/UpdateResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..a34a2882866a
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/UpdateResultJsonUnmarshaller.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.rdsdata.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * UpdateResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class UpdateResultJsonUnmarshaller implements Unmarshaller<UpdateResult, JsonUnmarshallerContext> {
+
+    public UpdateResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        UpdateResult updateResult = new UpdateResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("generatedFields", targetDepth)) {
+                    context.nextToken();
+                    updateResult.setGeneratedFields(new ListUnmarshaller<Field>(FieldJsonUnmarshaller.getInstance()).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return updateResult;
+    }
+
+    private static UpdateResultJsonUnmarshaller instance;
+
+    public static UpdateResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new UpdateResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/UpdateResultMarshaller.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/UpdateResultMarshaller.java
new file mode 100644
index 000000000000..6f45c66f5578
--- /dev/null
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/model/transform/UpdateResultMarshaller.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014-2019 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.rdsdata.model.transform;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.rdsdata.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * UpdateResultMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class UpdateResultMarshaller {
+
+    private static final MarshallingInfo<List> GENERATEDFIELDS_BINDING = MarshallingInfo.builder(MarshallingType.LIST)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("generatedFields").build();
+
+    private static final UpdateResultMarshaller instance = new UpdateResultMarshaller();
+
+    public static UpdateResultMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(UpdateResult updateResult, ProtocolMarshaller protocolMarshaller) {
+
+        if (updateResult == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(updateResult.getGeneratedFields(), GENERATEDFIELDS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/package-info.java b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/package-info.java
index 42b0a5871aea..38f544fbb6f3 100644
--- a/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/package-info.java
+++ b/aws-java-sdk-rdsdata/src/main/java/com/amazonaws/services/rdsdata/package-info.java
@@ -12,7 +12,16 @@
  */
 
 /**
- * AWS RDS DataService provides Http Endpoint to query RDS databases.
+ * <fullname>Amazon RDS Data Service</fullname>
+ * <p>
+ * Amazon RDS provides an HTTP endpoint to run SQL statements on an Amazon Aurora Serverless DB cluster. To run these
+ * statements, you work with the Data Service API.
+ * </p>
+ * <p>
+ * For more information about the Data Service API, see <a
+ * href="https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html">Using the Data API for Aurora
+ * Serverless</a> in the <i>Amazon Aurora User Guide</i>.
+ * </p>
  */
 package com.amazonaws.services.rdsdata;
 
diff --git a/aws-java-sdk-redshift/pom.xml b/aws-java-sdk-redshift/pom.xml
index c0bd2cb6d6b8..edad39ea8a6b 100644
--- a/aws-java-sdk-redshift/pom.xml
+++ b/aws-java-sdk-redshift/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-redshift</artifactId>
diff --git a/aws-java-sdk-rekognition/pom.xml b/aws-java-sdk-rekognition/pom.xml
index a9798ce484d2..b28a6a4dcb9d 100644
--- a/aws-java-sdk-rekognition/pom.xml
+++ b/aws-java-sdk-rekognition/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-rekognition</artifactId>
diff --git a/aws-java-sdk-resourcegroups/pom.xml b/aws-java-sdk-resourcegroups/pom.xml
index f2e2e845858f..25a86260cbd9 100644
--- a/aws-java-sdk-resourcegroups/pom.xml
+++ b/aws-java-sdk-resourcegroups/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-resourcegroups</artifactId>
diff --git a/aws-java-sdk-resourcegroupstaggingapi/pom.xml b/aws-java-sdk-resourcegroupstaggingapi/pom.xml
index d915064395ae..8ff7fff88427 100644
--- a/aws-java-sdk-resourcegroupstaggingapi/pom.xml
+++ b/aws-java-sdk-resourcegroupstaggingapi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-resourcegroupstaggingapi</artifactId>
diff --git a/aws-java-sdk-robomaker/pom.xml b/aws-java-sdk-robomaker/pom.xml
index 6fc0cb8e2f19..7ab0d77035e8 100644
--- a/aws-java-sdk-robomaker/pom.xml
+++ b/aws-java-sdk-robomaker/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-robomaker</artifactId>
diff --git a/aws-java-sdk-route53/pom.xml b/aws-java-sdk-route53/pom.xml
index 656646f50c98..bd844ef31709 100644
--- a/aws-java-sdk-route53/pom.xml
+++ b/aws-java-sdk-route53/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-route53</artifactId>
diff --git a/aws-java-sdk-route53resolver/pom.xml b/aws-java-sdk-route53resolver/pom.xml
index 4fee68faeb0f..c7ab913f9811 100644
--- a/aws-java-sdk-route53resolver/pom.xml
+++ b/aws-java-sdk-route53resolver/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-route53resolver</artifactId>
diff --git a/aws-java-sdk-s3/pom.xml b/aws-java-sdk-s3/pom.xml
index db25035147ab..16cbcfcb1de6 100644
--- a/aws-java-sdk-s3/pom.xml
+++ b/aws-java-sdk-s3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-s3</artifactId>
diff --git a/aws-java-sdk-s3/src/main/resources/mime.types b/aws-java-sdk-s3/src/main/resources/mime.types
index 405b67a99862..5a679df3cec5 100644
--- a/aws-java-sdk-s3/src/main/resources/mime.types
+++ b/aws-java-sdk-s3/src/main/resources/mime.types
@@ -38,6 +38,7 @@ application/index.vnd
 application/iotp
 application/ipp
 application/isup
+application/json		json
 application/mac-binhex40	hqx
 application/mac-compactpro	cpt
 application/macwriteii
diff --git a/aws-java-sdk-s3control/pom.xml b/aws-java-sdk-s3control/pom.xml
index 78ed28b7f669..73c18d48574f 100644
--- a/aws-java-sdk-s3control/pom.xml
+++ b/aws-java-sdk-s3control/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-s3control</artifactId>
diff --git a/aws-java-sdk-sagemaker/pom.xml b/aws-java-sdk-sagemaker/pom.xml
index da5f6a55ca87..6179d620b072 100644
--- a/aws-java-sdk-sagemaker/pom.xml
+++ b/aws-java-sdk-sagemaker/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-sagemaker</artifactId>
diff --git a/aws-java-sdk-sagemakerruntime/pom.xml b/aws-java-sdk-sagemakerruntime/pom.xml
index 728701c42417..99aeb858b936 100644
--- a/aws-java-sdk-sagemakerruntime/pom.xml
+++ b/aws-java-sdk-sagemakerruntime/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-sagemakerruntime</artifactId>
diff --git a/aws-java-sdk-secretsmanager/pom.xml b/aws-java-sdk-secretsmanager/pom.xml
index 337f4e1a884d..b61e75d67604 100644
--- a/aws-java-sdk-secretsmanager/pom.xml
+++ b/aws-java-sdk-secretsmanager/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-secretsmanager</artifactId>
diff --git a/aws-java-sdk-securityhub/pom.xml b/aws-java-sdk-securityhub/pom.xml
index ae5eabb374b7..7ab45e3de12f 100644
--- a/aws-java-sdk-securityhub/pom.xml
+++ b/aws-java-sdk-securityhub/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-securityhub</artifactId>
diff --git a/aws-java-sdk-serverlessapplicationrepository/pom.xml b/aws-java-sdk-serverlessapplicationrepository/pom.xml
index afd625de5f15..9d716810d0a2 100644
--- a/aws-java-sdk-serverlessapplicationrepository/pom.xml
+++ b/aws-java-sdk-serverlessapplicationrepository/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-serverlessapplicationrepository</artifactId>
diff --git a/aws-java-sdk-servermigration/pom.xml b/aws-java-sdk-servermigration/pom.xml
index 2f1d8c85d235..a87bb87fc303 100644
--- a/aws-java-sdk-servermigration/pom.xml
+++ b/aws-java-sdk-servermigration/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-servermigration</artifactId>
diff --git a/aws-java-sdk-servicecatalog/pom.xml b/aws-java-sdk-servicecatalog/pom.xml
index ad2f351dcb2e..af9e663c17bb 100644
--- a/aws-java-sdk-servicecatalog/pom.xml
+++ b/aws-java-sdk-servicecatalog/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-servicecatalog</artifactId>
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalog.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalog.java
index 3b8ce03e7806..5e6cc1807c4a 100644
--- a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalog.java
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalog.java
@@ -1365,6 +1365,27 @@ ListProvisioningArtifactsForServiceActionResult listProvisioningArtifactsForServ
     ListServiceActionsForProvisioningArtifactResult listServiceActionsForProvisioningArtifact(
             ListServiceActionsForProvisioningArtifactRequest listServiceActionsForProvisioningArtifactRequest);
 
+    /**
+     * <p>
+     * Returns summary information about stack instances that are associated with the specified
+     * <code>CFN_STACKSET</code> type provisioned product. You can filter for stack instances that are associated with a
+     * specific AWS account name or region.
+     * </p>
+     * 
+     * @param listStackInstancesForProvisionedProductRequest
+     * @return Result of the ListStackInstancesForProvisionedProduct operation returned by the service.
+     * @throws InvalidParametersException
+     *         One or more parameters provided to the operation are not valid.
+     * @throws ResourceNotFoundException
+     *         The specified resource was not found.
+     * @sample AWSServiceCatalog.ListStackInstancesForProvisionedProduct
+     * @see <a
+     *      href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/ListStackInstancesForProvisionedProduct"
+     *      target="_top">AWS API Documentation</a>
+     */
+    ListStackInstancesForProvisionedProductResult listStackInstancesForProvisionedProduct(
+            ListStackInstancesForProvisionedProductRequest listStackInstancesForProvisionedProductRequest);
+
     /**
      * <p>
      * Lists the specified TagOptions or all TagOptions.
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsync.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsync.java
index a8dbfd6cd277..b4b3e57eb37d 100644
--- a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsync.java
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsync.java
@@ -2332,6 +2332,47 @@ java.util.concurrent.Future<ListServiceActionsForProvisioningArtifactResult> lis
             ListServiceActionsForProvisioningArtifactRequest listServiceActionsForProvisioningArtifactRequest,
             com.amazonaws.handlers.AsyncHandler<ListServiceActionsForProvisioningArtifactRequest, ListServiceActionsForProvisioningArtifactResult> asyncHandler);
 
+    /**
+     * <p>
+     * Returns summary information about stack instances that are associated with the specified
+     * <code>CFN_STACKSET</code> type provisioned product. You can filter for stack instances that are associated with a
+     * specific AWS account name or region.
+     * </p>
+     * 
+     * @param listStackInstancesForProvisionedProductRequest
+     * @return A Java Future containing the result of the ListStackInstancesForProvisionedProduct operation returned by
+     *         the service.
+     * @sample AWSServiceCatalogAsync.ListStackInstancesForProvisionedProduct
+     * @see <a
+     *      href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/ListStackInstancesForProvisionedProduct"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult> listStackInstancesForProvisionedProductAsync(
+            ListStackInstancesForProvisionedProductRequest listStackInstancesForProvisionedProductRequest);
+
+    /**
+     * <p>
+     * Returns summary information about stack instances that are associated with the specified
+     * <code>CFN_STACKSET</code> type provisioned product. You can filter for stack instances that are associated with a
+     * specific AWS account name or region.
+     * </p>
+     * 
+     * @param listStackInstancesForProvisionedProductRequest
+     * @param asyncHandler
+     *        Asynchronous callback handler for events in the lifecycle of the request. Users can provide an
+     *        implementation of the callback methods in this interface to receive notification of successful or
+     *        unsuccessful completion of the operation.
+     * @return A Java Future containing the result of the ListStackInstancesForProvisionedProduct operation returned by
+     *         the service.
+     * @sample AWSServiceCatalogAsyncHandler.ListStackInstancesForProvisionedProduct
+     * @see <a
+     *      href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/ListStackInstancesForProvisionedProduct"
+     *      target="_top">AWS API Documentation</a>
+     */
+    java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult> listStackInstancesForProvisionedProductAsync(
+            ListStackInstancesForProvisionedProductRequest listStackInstancesForProvisionedProductRequest,
+            com.amazonaws.handlers.AsyncHandler<ListStackInstancesForProvisionedProductRequest, ListStackInstancesForProvisionedProductResult> asyncHandler);
+
     /**
      * <p>
      * Lists the specified TagOptions or all TagOptions.
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsyncClient.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsyncClient.java
index 6975644f6077..8ee7ec9fdfc1 100644
--- a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsyncClient.java
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogAsyncClient.java
@@ -2427,6 +2427,41 @@ public ListServiceActionsForProvisioningArtifactResult call() throws Exception {
         });
     }
 
+    @Override
+    public java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult> listStackInstancesForProvisionedProductAsync(
+            ListStackInstancesForProvisionedProductRequest request) {
+
+        return listStackInstancesForProvisionedProductAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult> listStackInstancesForProvisionedProductAsync(
+            final ListStackInstancesForProvisionedProductRequest request,
+            final com.amazonaws.handlers.AsyncHandler<ListStackInstancesForProvisionedProductRequest, ListStackInstancesForProvisionedProductResult> asyncHandler) {
+        final ListStackInstancesForProvisionedProductRequest finalRequest = beforeClientExecution(request);
+
+        return executorService.submit(new java.util.concurrent.Callable<ListStackInstancesForProvisionedProductResult>() {
+            @Override
+            public ListStackInstancesForProvisionedProductResult call() throws Exception {
+                ListStackInstancesForProvisionedProductResult result = null;
+
+                try {
+                    result = executeListStackInstancesForProvisionedProduct(finalRequest);
+                } catch (Exception ex) {
+                    if (asyncHandler != null) {
+                        asyncHandler.onError(ex);
+                    }
+                    throw ex;
+                }
+
+                if (asyncHandler != null) {
+                    asyncHandler.onSuccess(finalRequest, result);
+                }
+                return result;
+            }
+        });
+    }
+
     @Override
     public java.util.concurrent.Future<ListTagOptionsResult> listTagOptionsAsync(ListTagOptionsRequest request) {
 
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogClient.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogClient.java
index 9ff09917caf1..6bac1bcbdc36 100644
--- a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogClient.java
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AWSServiceCatalogClient.java
@@ -4260,6 +4260,69 @@ final ListServiceActionsForProvisioningArtifactResult executeListServiceActionsF
         }
     }
 
+    /**
+     * <p>
+     * Returns summary information about stack instances that are associated with the specified
+     * <code>CFN_STACKSET</code> type provisioned product. You can filter for stack instances that are associated with a
+     * specific AWS account name or region.
+     * </p>
+     * 
+     * @param listStackInstancesForProvisionedProductRequest
+     * @return Result of the ListStackInstancesForProvisionedProduct operation returned by the service.
+     * @throws InvalidParametersException
+     *         One or more parameters provided to the operation are not valid.
+     * @throws ResourceNotFoundException
+     *         The specified resource was not found.
+     * @sample AWSServiceCatalog.ListStackInstancesForProvisionedProduct
+     * @see <a
+     *      href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/ListStackInstancesForProvisionedProduct"
+     *      target="_top">AWS API Documentation</a>
+     */
+    @Override
+    public ListStackInstancesForProvisionedProductResult listStackInstancesForProvisionedProduct(ListStackInstancesForProvisionedProductRequest request) {
+        request = beforeClientExecution(request);
+        return executeListStackInstancesForProvisionedProduct(request);
+    }
+
+    @SdkInternalApi
+    final ListStackInstancesForProvisionedProductResult executeListStackInstancesForProvisionedProduct(
+            ListStackInstancesForProvisionedProductRequest listStackInstancesForProvisionedProductRequest) {
+
+        ExecutionContext executionContext = createExecutionContext(listStackInstancesForProvisionedProductRequest);
+        AWSRequestMetrics awsRequestMetrics = executionContext.getAwsRequestMetrics();
+        awsRequestMetrics.startEvent(Field.ClientExecuteTime);
+        Request<ListStackInstancesForProvisionedProductRequest> request = null;
+        Response<ListStackInstancesForProvisionedProductResult> response = null;
+
+        try {
+            awsRequestMetrics.startEvent(Field.RequestMarshallTime);
+            try {
+                request = new ListStackInstancesForProvisionedProductRequestProtocolMarshaller(protocolFactory).marshall(super
+                        .beforeMarshalling(listStackInstancesForProvisionedProductRequest));
+                // Binds the request metrics to the current request.
+                request.setAWSRequestMetrics(awsRequestMetrics);
+                request.addHandlerContext(HandlerContextKey.SIGNING_REGION, getSigningRegion());
+                request.addHandlerContext(HandlerContextKey.SERVICE_ID, "Service Catalog");
+                request.addHandlerContext(HandlerContextKey.OPERATION_NAME, "ListStackInstancesForProvisionedProduct");
+                request.addHandlerContext(HandlerContextKey.ADVANCED_CONFIG, advancedConfig);
+
+            } finally {
+                awsRequestMetrics.endEvent(Field.RequestMarshallTime);
+            }
+
+            HttpResponseHandler<AmazonWebServiceResponse<ListStackInstancesForProvisionedProductResult>> responseHandler = protocolFactory
+                    .createResponseHandler(new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
+                            new ListStackInstancesForProvisionedProductResultJsonUnmarshaller());
+            response = invoke(request, responseHandler, executionContext);
+
+            return response.getAwsResponse();
+
+        } finally {
+
+            endClientExecution(awsRequestMetrics, request, response);
+        }
+    }
+
     /**
      * <p>
      * Lists the specified TagOptions or all TagOptions.
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalog.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalog.java
index ae7b425b50cc..44db03eab2b9 100644
--- a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalog.java
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalog.java
@@ -366,6 +366,11 @@ public ListServiceActionsForProvisioningArtifactResult listServiceActionsForProv
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public ListStackInstancesForProvisionedProductResult listStackInstancesForProvisionedProduct(ListStackInstancesForProvisionedProductRequest request) {
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public ListTagOptionsResult listTagOptions(ListTagOptionsRequest request) {
         throw new java.lang.UnsupportedOperationException();
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalogAsync.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalogAsync.java
index 85a63c649693..9efae901da41 100644
--- a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalogAsync.java
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/AbstractAWSServiceCatalogAsync.java
@@ -898,6 +898,21 @@ public java.util.concurrent.Future<ListServiceActionsForProvisioningArtifactResu
         throw new java.lang.UnsupportedOperationException();
     }
 
+    @Override
+    public java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult> listStackInstancesForProvisionedProductAsync(
+            ListStackInstancesForProvisionedProductRequest request) {
+
+        return listStackInstancesForProvisionedProductAsync(request, null);
+    }
+
+    @Override
+    public java.util.concurrent.Future<ListStackInstancesForProvisionedProductResult> listStackInstancesForProvisionedProductAsync(
+            ListStackInstancesForProvisionedProductRequest request,
+            com.amazonaws.handlers.AsyncHandler<ListStackInstancesForProvisionedProductRequest, ListStackInstancesForProvisionedProductResult> asyncHandler) {
+
+        throw new java.lang.UnsupportedOperationException();
+    }
+
     @Override
     public java.util.concurrent.Future<ListTagOptionsResult> listTagOptionsAsync(ListTagOptionsRequest request) {
 
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/ListStackInstancesForProvisionedProductRequest.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/ListStackInstancesForProvisionedProductRequest.java
new file mode 100644
index 000000000000..5d59c30ea1be
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/ListStackInstancesForProvisionedProductRequest.java
@@ -0,0 +1,400 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * 
+ * @see <a
+ *      href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/ListStackInstancesForProvisionedProduct"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListStackInstancesForProvisionedProductRequest extends com.amazonaws.AmazonWebServiceRequest implements Serializable, Cloneable {
+
+    /**
+     * <p>
+     * The language code.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>en</code> - English (default)
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>jp</code> - Japanese
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>zh</code> - Chinese
+     * </p>
+     * </li>
+     * </ul>
+     */
+    private String acceptLanguage;
+    /**
+     * <p>
+     * The identifier of the provisioned product.
+     * </p>
+     */
+    private String provisionedProductId;
+    /**
+     * <p>
+     * The page token for the next set of results. To retrieve the first set of results, use null.
+     * </p>
+     */
+    private String pageToken;
+    /**
+     * <p>
+     * The maximum number of items to return with this call.
+     * </p>
+     */
+    private Integer pageSize;
+
+    /**
+     * <p>
+     * The language code.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>en</code> - English (default)
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>jp</code> - Japanese
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>zh</code> - Chinese
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @param acceptLanguage
+     *        The language code.</p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        <code>en</code> - English (default)
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>jp</code> - Japanese
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>zh</code> - Chinese
+     *        </p>
+     *        </li>
+     */
+
+    public void setAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+    }
+
+    /**
+     * <p>
+     * The language code.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>en</code> - English (default)
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>jp</code> - Japanese
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>zh</code> - Chinese
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @return The language code.</p>
+     *         <ul>
+     *         <li>
+     *         <p>
+     *         <code>en</code> - English (default)
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         <code>jp</code> - Japanese
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         <code>zh</code> - Chinese
+     *         </p>
+     *         </li>
+     */
+
+    public String getAcceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * <p>
+     * The language code.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>en</code> - English (default)
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>jp</code> - Japanese
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>zh</code> - Chinese
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @param acceptLanguage
+     *        The language code.</p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        <code>en</code> - English (default)
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>jp</code> - Japanese
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>zh</code> - Chinese
+     *        </p>
+     *        </li>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductRequest withAcceptLanguage(String acceptLanguage) {
+        setAcceptLanguage(acceptLanguage);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The identifier of the provisioned product.
+     * </p>
+     * 
+     * @param provisionedProductId
+     *        The identifier of the provisioned product.
+     */
+
+    public void setProvisionedProductId(String provisionedProductId) {
+        this.provisionedProductId = provisionedProductId;
+    }
+
+    /**
+     * <p>
+     * The identifier of the provisioned product.
+     * </p>
+     * 
+     * @return The identifier of the provisioned product.
+     */
+
+    public String getProvisionedProductId() {
+        return this.provisionedProductId;
+    }
+
+    /**
+     * <p>
+     * The identifier of the provisioned product.
+     * </p>
+     * 
+     * @param provisionedProductId
+     *        The identifier of the provisioned product.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductRequest withProvisionedProductId(String provisionedProductId) {
+        setProvisionedProductId(provisionedProductId);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The page token for the next set of results. To retrieve the first set of results, use null.
+     * </p>
+     * 
+     * @param pageToken
+     *        The page token for the next set of results. To retrieve the first set of results, use null.
+     */
+
+    public void setPageToken(String pageToken) {
+        this.pageToken = pageToken;
+    }
+
+    /**
+     * <p>
+     * The page token for the next set of results. To retrieve the first set of results, use null.
+     * </p>
+     * 
+     * @return The page token for the next set of results. To retrieve the first set of results, use null.
+     */
+
+    public String getPageToken() {
+        return this.pageToken;
+    }
+
+    /**
+     * <p>
+     * The page token for the next set of results. To retrieve the first set of results, use null.
+     * </p>
+     * 
+     * @param pageToken
+     *        The page token for the next set of results. To retrieve the first set of results, use null.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductRequest withPageToken(String pageToken) {
+        setPageToken(pageToken);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The maximum number of items to return with this call.
+     * </p>
+     * 
+     * @param pageSize
+     *        The maximum number of items to return with this call.
+     */
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    /**
+     * <p>
+     * The maximum number of items to return with this call.
+     * </p>
+     * 
+     * @return The maximum number of items to return with this call.
+     */
+
+    public Integer getPageSize() {
+        return this.pageSize;
+    }
+
+    /**
+     * <p>
+     * The maximum number of items to return with this call.
+     * </p>
+     * 
+     * @param pageSize
+     *        The maximum number of items to return with this call.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductRequest withPageSize(Integer pageSize) {
+        setPageSize(pageSize);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getAcceptLanguage() != null)
+            sb.append("AcceptLanguage: ").append(getAcceptLanguage()).append(",");
+        if (getProvisionedProductId() != null)
+            sb.append("ProvisionedProductId: ").append(getProvisionedProductId()).append(",");
+        if (getPageToken() != null)
+            sb.append("PageToken: ").append(getPageToken()).append(",");
+        if (getPageSize() != null)
+            sb.append("PageSize: ").append(getPageSize());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListStackInstancesForProvisionedProductRequest == false)
+            return false;
+        ListStackInstancesForProvisionedProductRequest other = (ListStackInstancesForProvisionedProductRequest) obj;
+        if (other.getAcceptLanguage() == null ^ this.getAcceptLanguage() == null)
+            return false;
+        if (other.getAcceptLanguage() != null && other.getAcceptLanguage().equals(this.getAcceptLanguage()) == false)
+            return false;
+        if (other.getProvisionedProductId() == null ^ this.getProvisionedProductId() == null)
+            return false;
+        if (other.getProvisionedProductId() != null && other.getProvisionedProductId().equals(this.getProvisionedProductId()) == false)
+            return false;
+        if (other.getPageToken() == null ^ this.getPageToken() == null)
+            return false;
+        if (other.getPageToken() != null && other.getPageToken().equals(this.getPageToken()) == false)
+            return false;
+        if (other.getPageSize() == null ^ this.getPageSize() == null)
+            return false;
+        if (other.getPageSize() != null && other.getPageSize().equals(this.getPageSize()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getAcceptLanguage() == null) ? 0 : getAcceptLanguage().hashCode());
+        hashCode = prime * hashCode + ((getProvisionedProductId() == null) ? 0 : getProvisionedProductId().hashCode());
+        hashCode = prime * hashCode + ((getPageToken() == null) ? 0 : getPageToken().hashCode());
+        hashCode = prime * hashCode + ((getPageSize() == null) ? 0 : getPageSize().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListStackInstancesForProvisionedProductRequest clone() {
+        return (ListStackInstancesForProvisionedProductRequest) super.clone();
+    }
+
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/ListStackInstancesForProvisionedProductResult.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/ListStackInstancesForProvisionedProductResult.java
new file mode 100644
index 000000000000..9fa8f2d94d53
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/ListStackInstancesForProvisionedProductResult.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+
+/**
+ * 
+ * @see <a
+ *      href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/ListStackInstancesForProvisionedProduct"
+ *      target="_top">AWS API Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListStackInstancesForProvisionedProductResult extends com.amazonaws.AmazonWebServiceResult<com.amazonaws.ResponseMetadata> implements
+        Serializable, Cloneable {
+
+    /**
+     * <p>
+     * List of stack instances.
+     * </p>
+     */
+    private java.util.List<StackInstance> stackInstances;
+    /**
+     * <p>
+     * The page token to use to retrieve the next set of results. If there are no additional results, this value is
+     * null.
+     * </p>
+     */
+    private String nextPageToken;
+
+    /**
+     * <p>
+     * List of stack instances.
+     * </p>
+     * 
+     * @return List of stack instances.
+     */
+
+    public java.util.List<StackInstance> getStackInstances() {
+        return stackInstances;
+    }
+
+    /**
+     * <p>
+     * List of stack instances.
+     * </p>
+     * 
+     * @param stackInstances
+     *        List of stack instances.
+     */
+
+    public void setStackInstances(java.util.Collection<StackInstance> stackInstances) {
+        if (stackInstances == null) {
+            this.stackInstances = null;
+            return;
+        }
+
+        this.stackInstances = new java.util.ArrayList<StackInstance>(stackInstances);
+    }
+
+    /**
+     * <p>
+     * List of stack instances.
+     * </p>
+     * <p>
+     * <b>NOTE:</b> This method appends the values to the existing list (if any). Use
+     * {@link #setStackInstances(java.util.Collection)} or {@link #withStackInstances(java.util.Collection)} if you want
+     * to override the existing values.
+     * </p>
+     * 
+     * @param stackInstances
+     *        List of stack instances.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductResult withStackInstances(StackInstance... stackInstances) {
+        if (this.stackInstances == null) {
+            setStackInstances(new java.util.ArrayList<StackInstance>(stackInstances.length));
+        }
+        for (StackInstance ele : stackInstances) {
+            this.stackInstances.add(ele);
+        }
+        return this;
+    }
+
+    /**
+     * <p>
+     * List of stack instances.
+     * </p>
+     * 
+     * @param stackInstances
+     *        List of stack instances.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductResult withStackInstances(java.util.Collection<StackInstance> stackInstances) {
+        setStackInstances(stackInstances);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The page token to use to retrieve the next set of results. If there are no additional results, this value is
+     * null.
+     * </p>
+     * 
+     * @param nextPageToken
+     *        The page token to use to retrieve the next set of results. If there are no additional results, this value
+     *        is null.
+     */
+
+    public void setNextPageToken(String nextPageToken) {
+        this.nextPageToken = nextPageToken;
+    }
+
+    /**
+     * <p>
+     * The page token to use to retrieve the next set of results. If there are no additional results, this value is
+     * null.
+     * </p>
+     * 
+     * @return The page token to use to retrieve the next set of results. If there are no additional results, this value
+     *         is null.
+     */
+
+    public String getNextPageToken() {
+        return this.nextPageToken;
+    }
+
+    /**
+     * <p>
+     * The page token to use to retrieve the next set of results. If there are no additional results, this value is
+     * null.
+     * </p>
+     * 
+     * @param nextPageToken
+     *        The page token to use to retrieve the next set of results. If there are no additional results, this value
+     *        is null.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public ListStackInstancesForProvisionedProductResult withNextPageToken(String nextPageToken) {
+        setNextPageToken(nextPageToken);
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getStackInstances() != null)
+            sb.append("StackInstances: ").append(getStackInstances()).append(",");
+        if (getNextPageToken() != null)
+            sb.append("NextPageToken: ").append(getNextPageToken());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof ListStackInstancesForProvisionedProductResult == false)
+            return false;
+        ListStackInstancesForProvisionedProductResult other = (ListStackInstancesForProvisionedProductResult) obj;
+        if (other.getStackInstances() == null ^ this.getStackInstances() == null)
+            return false;
+        if (other.getStackInstances() != null && other.getStackInstances().equals(this.getStackInstances()) == false)
+            return false;
+        if (other.getNextPageToken() == null ^ this.getNextPageToken() == null)
+            return false;
+        if (other.getNextPageToken() != null && other.getNextPageToken().equals(this.getNextPageToken()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getStackInstances() == null) ? 0 : getStackInstances().hashCode());
+        hashCode = prime * hashCode + ((getNextPageToken() == null) ? 0 : getNextPageToken().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public ListStackInstancesForProvisionedProductResult clone() {
+        try {
+            return (ListStackInstancesForProvisionedProductResult) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/StackInstance.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/StackInstance.java
new file mode 100644
index 000000000000..ba77fd5a5d6a
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/StackInstance.java
@@ -0,0 +1,468 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model;
+
+import java.io.Serializable;
+import javax.annotation.Generated;
+import com.amazonaws.protocol.StructuredPojo;
+import com.amazonaws.protocol.ProtocolMarshaller;
+
+/**
+ * <p>
+ * An AWS CloudFormation stack, in a specific account and region, that's part of a stack set operation. A stack instance
+ * is a reference to an attempted or actual stack in a given account within a given region. A stack instance can exist
+ * without a stack—for example, if the stack couldn't be created for some reason. A stack instance is associated with
+ * only one stack set. Each stack instance contains the ID of its associated stack set, as well as the ID of the actual
+ * stack and the stack status.
+ * </p>
+ * 
+ * @see <a href="http://docs.aws.amazon.com/goto/WebAPI/servicecatalog-2015-12-10/StackInstance" target="_top">AWS API
+ *      Documentation</a>
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StackInstance implements Serializable, Cloneable, StructuredPojo {
+
+    /**
+     * <p>
+     * The name of the AWS account that the stack instance is associated with.
+     * </p>
+     */
+    private String account;
+    /**
+     * <p>
+     * The name of the AWS region that the stack instance is associated with.
+     * </p>
+     */
+    private String region;
+    /**
+     * <p>
+     * The status of the stack instance, in terms of its synchronization with its associated stack set.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     * unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might
+     * need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to
+     * delete the stack instance, and then delete the stack manually.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated
+     * stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part
+     * of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the
+     * stack was created or updated.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     * </p>
+     * </li>
+     * </ul>
+     */
+    private String stackInstanceStatus;
+
+    /**
+     * <p>
+     * The name of the AWS account that the stack instance is associated with.
+     * </p>
+     * 
+     * @param account
+     *        The name of the AWS account that the stack instance is associated with.
+     */
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    /**
+     * <p>
+     * The name of the AWS account that the stack instance is associated with.
+     * </p>
+     * 
+     * @return The name of the AWS account that the stack instance is associated with.
+     */
+
+    public String getAccount() {
+        return this.account;
+    }
+
+    /**
+     * <p>
+     * The name of the AWS account that the stack instance is associated with.
+     * </p>
+     * 
+     * @param account
+     *        The name of the AWS account that the stack instance is associated with.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StackInstance withAccount(String account) {
+        setAccount(account);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The name of the AWS region that the stack instance is associated with.
+     * </p>
+     * 
+     * @param region
+     *        The name of the AWS region that the stack instance is associated with.
+     */
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    /**
+     * <p>
+     * The name of the AWS region that the stack instance is associated with.
+     * </p>
+     * 
+     * @return The name of the AWS region that the stack instance is associated with.
+     */
+
+    public String getRegion() {
+        return this.region;
+    }
+
+    /**
+     * <p>
+     * The name of the AWS region that the stack instance is associated with.
+     * </p>
+     * 
+     * @param region
+     *        The name of the AWS region that the stack instance is associated with.
+     * @return Returns a reference to this object so that method calls can be chained together.
+     */
+
+    public StackInstance withRegion(String region) {
+        setRegion(region);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the stack instance, in terms of its synchronization with its associated stack set.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     * unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might
+     * need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to
+     * delete the stack instance, and then delete the stack manually.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated
+     * stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part
+     * of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the
+     * stack was created or updated.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @param stackInstanceStatus
+     *        The status of the stack instance, in terms of its synchronization with its associated stack set. </p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     *        unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You
+     *        might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to
+     *        true, to delete the stack instance, and then delete the stack manually.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the
+     *        associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or
+     *        the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed
+     *        or was stopped before the stack was created or updated.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     *        </p>
+     *        </li>
+     * @see StackInstanceStatus
+     */
+
+    public void setStackInstanceStatus(String stackInstanceStatus) {
+        this.stackInstanceStatus = stackInstanceStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the stack instance, in terms of its synchronization with its associated stack set.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     * unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might
+     * need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to
+     * delete the stack instance, and then delete the stack manually.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated
+     * stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part
+     * of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the
+     * stack was created or updated.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @return The status of the stack instance, in terms of its synchronization with its associated stack set. </p>
+     *         <ul>
+     *         <li>
+     *         <p>
+     *         <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in
+     *         an unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations.
+     *         You might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code>
+     *         set to true, to delete the stack instance, and then delete the stack manually.
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the
+     *         associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or
+     *         the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed
+     *         or was stopped before the stack was created or updated.
+     *         </p>
+     *         </li>
+     *         <li>
+     *         <p>
+     *         <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     *         </p>
+     *         </li>
+     * @see StackInstanceStatus
+     */
+
+    public String getStackInstanceStatus() {
+        return this.stackInstanceStatus;
+    }
+
+    /**
+     * <p>
+     * The status of the stack instance, in terms of its synchronization with its associated stack set.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     * unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might
+     * need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to
+     * delete the stack instance, and then delete the stack manually.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated
+     * stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part
+     * of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the
+     * stack was created or updated.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @param stackInstanceStatus
+     *        The status of the stack instance, in terms of its synchronization with its associated stack set. </p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     *        unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You
+     *        might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to
+     *        true, to delete the stack instance, and then delete the stack manually.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the
+     *        associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or
+     *        the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed
+     *        or was stopped before the stack was created or updated.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     *        </p>
+     *        </li>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see StackInstanceStatus
+     */
+
+    public StackInstance withStackInstanceStatus(String stackInstanceStatus) {
+        setStackInstanceStatus(stackInstanceStatus);
+        return this;
+    }
+
+    /**
+     * <p>
+     * The status of the stack instance, in terms of its synchronization with its associated stack set.
+     * </p>
+     * <ul>
+     * <li>
+     * <p>
+     * <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     * unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You might
+     * need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to true, to
+     * delete the stack instance, and then delete the stack manually.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the associated
+     * stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or the stack was part
+     * of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed or was stopped before the
+     * stack was created or updated.
+     * </p>
+     * </li>
+     * <li>
+     * <p>
+     * <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     * </p>
+     * </li>
+     * </ul>
+     * 
+     * @param stackInstanceStatus
+     *        The status of the stack instance, in terms of its synchronization with its associated stack set. </p>
+     *        <ul>
+     *        <li>
+     *        <p>
+     *        <code>INOPERABLE</code>: A <code>DeleteStackInstances</code> operation has failed and left the stack in an
+     *        unstable state. Stacks in this state are excluded from further <code>UpdateStackSet</code> operations. You
+     *        might need to perform a <code>DeleteStackInstances</code> operation, with <code>RetainStacks</code> set to
+     *        true, to delete the stack instance, and then delete the stack manually.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>OUTDATED</code>: The stack isn't currently up to date with the stack set because either the
+     *        associated stack failed during a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation, or
+     *        the stack was part of a <code>CreateStackSet</code> or <code>UpdateStackSet</code> operation that failed
+     *        or was stopped before the stack was created or updated.
+     *        </p>
+     *        </li>
+     *        <li>
+     *        <p>
+     *        <code>CURRENT</code>: The stack is currently up to date with the stack set.
+     *        </p>
+     *        </li>
+     * @return Returns a reference to this object so that method calls can be chained together.
+     * @see StackInstanceStatus
+     */
+
+    public StackInstance withStackInstanceStatus(StackInstanceStatus stackInstanceStatus) {
+        this.stackInstanceStatus = stackInstanceStatus.toString();
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object. This is useful for testing and debugging. Sensitive data will be
+     * redacted from this string using a placeholder value.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getAccount() != null)
+            sb.append("Account: ").append(getAccount()).append(",");
+        if (getRegion() != null)
+            sb.append("Region: ").append(getRegion()).append(",");
+        if (getStackInstanceStatus() != null)
+            sb.append("StackInstanceStatus: ").append(getStackInstanceStatus());
+        sb.append("}");
+        return sb.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+
+        if (obj instanceof StackInstance == false)
+            return false;
+        StackInstance other = (StackInstance) obj;
+        if (other.getAccount() == null ^ this.getAccount() == null)
+            return false;
+        if (other.getAccount() != null && other.getAccount().equals(this.getAccount()) == false)
+            return false;
+        if (other.getRegion() == null ^ this.getRegion() == null)
+            return false;
+        if (other.getRegion() != null && other.getRegion().equals(this.getRegion()) == false)
+            return false;
+        if (other.getStackInstanceStatus() == null ^ this.getStackInstanceStatus() == null)
+            return false;
+        if (other.getStackInstanceStatus() != null && other.getStackInstanceStatus().equals(this.getStackInstanceStatus()) == false)
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+
+        hashCode = prime * hashCode + ((getAccount() == null) ? 0 : getAccount().hashCode());
+        hashCode = prime * hashCode + ((getRegion() == null) ? 0 : getRegion().hashCode());
+        hashCode = prime * hashCode + ((getStackInstanceStatus() == null) ? 0 : getStackInstanceStatus().hashCode());
+        return hashCode;
+    }
+
+    @Override
+    public StackInstance clone() {
+        try {
+            return (StackInstance) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new IllegalStateException("Got a CloneNotSupportedException from Object.clone() " + "even though we're Cloneable!", e);
+        }
+    }
+
+    @com.amazonaws.annotation.SdkInternalApi
+    @Override
+    public void marshall(ProtocolMarshaller protocolMarshaller) {
+        com.amazonaws.services.servicecatalog.model.transform.StackInstanceMarshaller.getInstance().marshall(this, protocolMarshaller);
+    }
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/StackInstanceStatus.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/StackInstanceStatus.java
new file mode 100644
index 000000000000..1135532962f6
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/StackInstanceStatus.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model;
+
+import javax.annotation.Generated;
+
+/**
+ * 
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public enum StackInstanceStatus {
+
+    CURRENT("CURRENT"),
+    OUTDATED("OUTDATED"),
+    INOPERABLE("INOPERABLE");
+
+    private String value;
+
+    private StackInstanceStatus(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value
+     *        real value
+     * @return StackInstanceStatus corresponding to the value
+     *
+     * @throws IllegalArgumentException
+     *         If the specified value does not map to one of the known values in this enum.
+     */
+    public static StackInstanceStatus fromValue(String value) {
+        if (value == null || "".equals(value)) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        }
+
+        for (StackInstanceStatus enumEntry : StackInstanceStatus.values()) {
+            if (enumEntry.toString().equals(value)) {
+                return enumEntry;
+            }
+        }
+
+        throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+    }
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductRequestMarshaller.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductRequestMarshaller.java
new file mode 100644
index 000000000000..49ddb1e0e48e
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductRequestMarshaller.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.servicecatalog.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListStackInstancesForProvisionedProductRequestMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListStackInstancesForProvisionedProductRequestMarshaller {
+
+    private static final MarshallingInfo<String> ACCEPTLANGUAGE_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("AcceptLanguage").build();
+    private static final MarshallingInfo<String> PROVISIONEDPRODUCTID_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("ProvisionedProductId").build();
+    private static final MarshallingInfo<String> PAGETOKEN_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("PageToken").build();
+    private static final MarshallingInfo<Integer> PAGESIZE_BINDING = MarshallingInfo.builder(MarshallingType.INTEGER)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("PageSize").build();
+
+    private static final ListStackInstancesForProvisionedProductRequestMarshaller instance = new ListStackInstancesForProvisionedProductRequestMarshaller();
+
+    public static ListStackInstancesForProvisionedProductRequestMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(ListStackInstancesForProvisionedProductRequest listStackInstancesForProvisionedProductRequest, ProtocolMarshaller protocolMarshaller) {
+
+        if (listStackInstancesForProvisionedProductRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(listStackInstancesForProvisionedProductRequest.getAcceptLanguage(), ACCEPTLANGUAGE_BINDING);
+            protocolMarshaller.marshall(listStackInstancesForProvisionedProductRequest.getProvisionedProductId(), PROVISIONEDPRODUCTID_BINDING);
+            protocolMarshaller.marshall(listStackInstancesForProvisionedProductRequest.getPageToken(), PAGETOKEN_BINDING);
+            protocolMarshaller.marshall(listStackInstancesForProvisionedProductRequest.getPageSize(), PAGESIZE_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductRequestProtocolMarshaller.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductRequestProtocolMarshaller.java
new file mode 100644
index 000000000000..e2b1bd4aff38
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductRequestProtocolMarshaller.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.Request;
+
+import com.amazonaws.http.HttpMethodName;
+import com.amazonaws.services.servicecatalog.model.*;
+import com.amazonaws.transform.Marshaller;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.protocol.Protocol;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * ListStackInstancesForProvisionedProductRequest Marshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class ListStackInstancesForProvisionedProductRequestProtocolMarshaller implements
+        Marshaller<Request<ListStackInstancesForProvisionedProductRequest>, ListStackInstancesForProvisionedProductRequest> {
+
+    private static final OperationInfo SDK_OPERATION_BINDING = OperationInfo.builder().protocol(Protocol.AWS_JSON).requestUri("/")
+            .httpMethodName(HttpMethodName.POST).hasExplicitPayloadMember(false).hasPayloadMembers(true)
+            .operationIdentifier("AWS242ServiceCatalogService.ListStackInstancesForProvisionedProduct").serviceName("AWSServiceCatalog").build();
+
+    private final com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory;
+
+    public ListStackInstancesForProvisionedProductRequestProtocolMarshaller(com.amazonaws.protocol.json.SdkJsonProtocolFactory protocolFactory) {
+        this.protocolFactory = protocolFactory;
+    }
+
+    public Request<ListStackInstancesForProvisionedProductRequest> marshall(
+            ListStackInstancesForProvisionedProductRequest listStackInstancesForProvisionedProductRequest) {
+
+        if (listStackInstancesForProvisionedProductRequest == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            final ProtocolRequestMarshaller<ListStackInstancesForProvisionedProductRequest> protocolMarshaller = protocolFactory.createProtocolMarshaller(
+                    SDK_OPERATION_BINDING, listStackInstancesForProvisionedProductRequest);
+
+            protocolMarshaller.startMarshalling();
+            ListStackInstancesForProvisionedProductRequestMarshaller.getInstance().marshall(listStackInstancesForProvisionedProductRequest, protocolMarshaller);
+            return protocolMarshaller.finishMarshalling();
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductResultJsonUnmarshaller.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductResultJsonUnmarshaller.java
new file mode 100644
index 000000000000..26776939dca3
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/ListStackInstancesForProvisionedProductResultJsonUnmarshaller.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.servicecatalog.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * ListStackInstancesForProvisionedProductResult JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class ListStackInstancesForProvisionedProductResultJsonUnmarshaller implements
+        Unmarshaller<ListStackInstancesForProvisionedProductResult, JsonUnmarshallerContext> {
+
+    public ListStackInstancesForProvisionedProductResult unmarshall(JsonUnmarshallerContext context) throws Exception {
+        ListStackInstancesForProvisionedProductResult listStackInstancesForProvisionedProductResult = new ListStackInstancesForProvisionedProductResult();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return listStackInstancesForProvisionedProductResult;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("StackInstances", targetDepth)) {
+                    context.nextToken();
+                    listStackInstancesForProvisionedProductResult.setStackInstances(new ListUnmarshaller<StackInstance>(StackInstanceJsonUnmarshaller
+                            .getInstance()).unmarshall(context));
+                }
+                if (context.testExpression("NextPageToken", targetDepth)) {
+                    context.nextToken();
+                    listStackInstancesForProvisionedProductResult.setNextPageToken(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return listStackInstancesForProvisionedProductResult;
+    }
+
+    private static ListStackInstancesForProvisionedProductResultJsonUnmarshaller instance;
+
+    public static ListStackInstancesForProvisionedProductResultJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new ListStackInstancesForProvisionedProductResultJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/StackInstanceJsonUnmarshaller.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/StackInstanceJsonUnmarshaller.java
new file mode 100644
index 000000000000..ce68eb33bc65
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/StackInstanceJsonUnmarshaller.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model.transform;
+
+import java.math.*;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.services.servicecatalog.model.*;
+import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*;
+import com.amazonaws.transform.*;
+
+import com.fasterxml.jackson.core.JsonToken;
+import static com.fasterxml.jackson.core.JsonToken.*;
+
+/**
+ * StackInstance JSON Unmarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+public class StackInstanceJsonUnmarshaller implements Unmarshaller<StackInstance, JsonUnmarshallerContext> {
+
+    public StackInstance unmarshall(JsonUnmarshallerContext context) throws Exception {
+        StackInstance stackInstance = new StackInstance();
+
+        int originalDepth = context.getCurrentDepth();
+        String currentParentElement = context.getCurrentParentElement();
+        int targetDepth = originalDepth + 1;
+
+        JsonToken token = context.getCurrentToken();
+        if (token == null)
+            token = context.nextToken();
+        if (token == VALUE_NULL) {
+            return null;
+        }
+
+        while (true) {
+            if (token == null)
+                break;
+
+            if (token == FIELD_NAME || token == START_OBJECT) {
+                if (context.testExpression("Account", targetDepth)) {
+                    context.nextToken();
+                    stackInstance.setAccount(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("Region", targetDepth)) {
+                    context.nextToken();
+                    stackInstance.setRegion(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+                if (context.testExpression("StackInstanceStatus", targetDepth)) {
+                    context.nextToken();
+                    stackInstance.setStackInstanceStatus(context.getUnmarshaller(String.class).unmarshall(context));
+                }
+            } else if (token == END_ARRAY || token == END_OBJECT) {
+                if (context.getLastParsedParentElement() == null || context.getLastParsedParentElement().equals(currentParentElement)) {
+                    if (context.getCurrentDepth() <= originalDepth)
+                        break;
+                }
+            }
+            token = context.nextToken();
+        }
+
+        return stackInstance;
+    }
+
+    private static StackInstanceJsonUnmarshaller instance;
+
+    public static StackInstanceJsonUnmarshaller getInstance() {
+        if (instance == null)
+            instance = new StackInstanceJsonUnmarshaller();
+        return instance;
+    }
+}
diff --git a/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/StackInstanceMarshaller.java b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/StackInstanceMarshaller.java
new file mode 100644
index 000000000000..d572f356385a
--- /dev/null
+++ b/aws-java-sdk-servicecatalog/src/main/java/com/amazonaws/services/servicecatalog/model/transform/StackInstanceMarshaller.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2014-2019 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.servicecatalog.model.transform;
+
+import javax.annotation.Generated;
+
+import com.amazonaws.SdkClientException;
+import com.amazonaws.services.servicecatalog.model.*;
+
+import com.amazonaws.protocol.*;
+import com.amazonaws.annotation.SdkInternalApi;
+
+/**
+ * StackInstanceMarshaller
+ */
+@Generated("com.amazonaws:aws-java-sdk-code-generator")
+@SdkInternalApi
+public class StackInstanceMarshaller {
+
+    private static final MarshallingInfo<String> ACCOUNT_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("Account").build();
+    private static final MarshallingInfo<String> REGION_BINDING = MarshallingInfo.builder(MarshallingType.STRING).marshallLocation(MarshallLocation.PAYLOAD)
+            .marshallLocationName("Region").build();
+    private static final MarshallingInfo<String> STACKINSTANCESTATUS_BINDING = MarshallingInfo.builder(MarshallingType.STRING)
+            .marshallLocation(MarshallLocation.PAYLOAD).marshallLocationName("StackInstanceStatus").build();
+
+    private static final StackInstanceMarshaller instance = new StackInstanceMarshaller();
+
+    public static StackInstanceMarshaller getInstance() {
+        return instance;
+    }
+
+    /**
+     * Marshall the given parameter object.
+     */
+    public void marshall(StackInstance stackInstance, ProtocolMarshaller protocolMarshaller) {
+
+        if (stackInstance == null) {
+            throw new SdkClientException("Invalid argument passed to marshall(...)");
+        }
+
+        try {
+            protocolMarshaller.marshall(stackInstance.getAccount(), ACCOUNT_BINDING);
+            protocolMarshaller.marshall(stackInstance.getRegion(), REGION_BINDING);
+            protocolMarshaller.marshall(stackInstance.getStackInstanceStatus(), STACKINSTANCESTATUS_BINDING);
+        } catch (Exception e) {
+            throw new SdkClientException("Unable to marshall request to JSON: " + e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/aws-java-sdk-servicediscovery/pom.xml b/aws-java-sdk-servicediscovery/pom.xml
index 0b990bf0a140..484db73ecace 100644
--- a/aws-java-sdk-servicediscovery/pom.xml
+++ b/aws-java-sdk-servicediscovery/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-servicediscovery</artifactId>
diff --git a/aws-java-sdk-ses/pom.xml b/aws-java-sdk-ses/pom.xml
index 3669f20031cd..a14b1d1d04ec 100644
--- a/aws-java-sdk-ses/pom.xml
+++ b/aws-java-sdk-ses/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-ses</artifactId>
diff --git a/aws-java-sdk-shield/pom.xml b/aws-java-sdk-shield/pom.xml
index 3911cf568848..b241cf997b48 100644
--- a/aws-java-sdk-shield/pom.xml
+++ b/aws-java-sdk-shield/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-shield</artifactId>
diff --git a/aws-java-sdk-signer/pom.xml b/aws-java-sdk-signer/pom.xml
index ad1a97da618a..66d0ad7cb51e 100644
--- a/aws-java-sdk-signer/pom.xml
+++ b/aws-java-sdk-signer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-signer</artifactId>
diff --git a/aws-java-sdk-simpledb/pom.xml b/aws-java-sdk-simpledb/pom.xml
index 2c5328722dc6..f6c2d8949a7d 100644
--- a/aws-java-sdk-simpledb/pom.xml
+++ b/aws-java-sdk-simpledb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-simpledb</artifactId>
diff --git a/aws-java-sdk-simpleworkflow/pom.xml b/aws-java-sdk-simpleworkflow/pom.xml
index 69364362b7ec..128998da5fb1 100644
--- a/aws-java-sdk-simpleworkflow/pom.xml
+++ b/aws-java-sdk-simpleworkflow/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-simpleworkflow</artifactId>
diff --git a/aws-java-sdk-snowball/pom.xml b/aws-java-sdk-snowball/pom.xml
index 933db8115f71..68262283efba 100644
--- a/aws-java-sdk-snowball/pom.xml
+++ b/aws-java-sdk-snowball/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-snowball</artifactId>
diff --git a/aws-java-sdk-sns/pom.xml b/aws-java-sdk-sns/pom.xml
index 98860da995bf..1bdc5a22be5c 100644
--- a/aws-java-sdk-sns/pom.xml
+++ b/aws-java-sdk-sns/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-sns</artifactId>
diff --git a/aws-java-sdk-sqs/pom.xml b/aws-java-sdk-sqs/pom.xml
index a72faa406459..f41f9fc7833f 100644
--- a/aws-java-sdk-sqs/pom.xml
+++ b/aws-java-sdk-sqs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-sqs</artifactId>
diff --git a/aws-java-sdk-ssm/pom.xml b/aws-java-sdk-ssm/pom.xml
index d18bab049f93..a533ae65dc3d 100644
--- a/aws-java-sdk-ssm/pom.xml
+++ b/aws-java-sdk-ssm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-ssm</artifactId>
diff --git a/aws-java-sdk-stepfunctions/pom.xml b/aws-java-sdk-stepfunctions/pom.xml
index d6ffcf74f95a..bdb5ba6573fc 100644
--- a/aws-java-sdk-stepfunctions/pom.xml
+++ b/aws-java-sdk-stepfunctions/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-stepfunctions</artifactId>
diff --git a/aws-java-sdk-storagegateway/pom.xml b/aws-java-sdk-storagegateway/pom.xml
index 4a77040151f8..3a308c5f65f9 100644
--- a/aws-java-sdk-storagegateway/pom.xml
+++ b/aws-java-sdk-storagegateway/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-storagegateway</artifactId>
diff --git a/aws-java-sdk-sts/pom.xml b/aws-java-sdk-sts/pom.xml
index 2b7b3b2f10db..7a28cfe4cd32 100644
--- a/aws-java-sdk-sts/pom.xml
+++ b/aws-java-sdk-sts/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-sts</artifactId>
diff --git a/aws-java-sdk-support/pom.xml b/aws-java-sdk-support/pom.xml
index 75f262ac4f49..825d2a3c221a 100644
--- a/aws-java-sdk-support/pom.xml
+++ b/aws-java-sdk-support/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-support</artifactId>
diff --git a/aws-java-sdk-test-utils/pom.xml b/aws-java-sdk-test-utils/pom.xml
index 58750dba4ebc..29ec604e2578 100644
--- a/aws-java-sdk-test-utils/pom.xml
+++ b/aws-java-sdk-test-utils/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-test-utils</artifactId>
diff --git a/aws-java-sdk-textract/pom.xml b/aws-java-sdk-textract/pom.xml
index b47086bbe398..ff6713cb13fe 100644
--- a/aws-java-sdk-textract/pom.xml
+++ b/aws-java-sdk-textract/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-textract</artifactId>
diff --git a/aws-java-sdk-transcribe/pom.xml b/aws-java-sdk-transcribe/pom.xml
index 77a95a6df4fd..fb6363e4a254 100644
--- a/aws-java-sdk-transcribe/pom.xml
+++ b/aws-java-sdk-transcribe/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-transcribe</artifactId>
diff --git a/aws-java-sdk-transfer/pom.xml b/aws-java-sdk-transfer/pom.xml
index 0f06c6ca95b2..e463016831db 100644
--- a/aws-java-sdk-transfer/pom.xml
+++ b/aws-java-sdk-transfer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-transfer</artifactId>
diff --git a/aws-java-sdk-translate/pom.xml b/aws-java-sdk-translate/pom.xml
index 514e9b4f5fd5..a9a28812cd4b 100644
--- a/aws-java-sdk-translate/pom.xml
+++ b/aws-java-sdk-translate/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-translate</artifactId>
diff --git a/aws-java-sdk-waf/pom.xml b/aws-java-sdk-waf/pom.xml
index 0b3a0e1fdc5c..ad7603ca36ef 100644
--- a/aws-java-sdk-waf/pom.xml
+++ b/aws-java-sdk-waf/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-waf</artifactId>
diff --git a/aws-java-sdk-workdocs/pom.xml b/aws-java-sdk-workdocs/pom.xml
index 03e145241f5b..c7aa8a6233df 100644
--- a/aws-java-sdk-workdocs/pom.xml
+++ b/aws-java-sdk-workdocs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-workdocs</artifactId>
diff --git a/aws-java-sdk-worklink/pom.xml b/aws-java-sdk-worklink/pom.xml
index 7a957774bf2b..246a3fb8c8db 100644
--- a/aws-java-sdk-worklink/pom.xml
+++ b/aws-java-sdk-worklink/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-worklink</artifactId>
diff --git a/aws-java-sdk-workmail/pom.xml b/aws-java-sdk-workmail/pom.xml
index 65fbd8949c89..e3b9bb2c88a8 100644
--- a/aws-java-sdk-workmail/pom.xml
+++ b/aws-java-sdk-workmail/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-workmail</artifactId>
diff --git a/aws-java-sdk-workspaces/pom.xml b/aws-java-sdk-workspaces/pom.xml
index 82d57a452818..df5d228d54b6 100644
--- a/aws-java-sdk-workspaces/pom.xml
+++ b/aws-java-sdk-workspaces/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-workspaces</artifactId>
diff --git a/aws-java-sdk-xray/pom.xml b/aws-java-sdk-xray/pom.xml
index cd0f2dbb15f6..42d16a57716b 100644
--- a/aws-java-sdk-xray/pom.xml
+++ b/aws-java-sdk-xray/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-xray</artifactId>
diff --git a/aws-java-sdk/pom.xml b/aws-java-sdk/pom.xml
index 7f1c92b656de..cdfd32c6be5d 100644
--- a/aws-java-sdk/pom.xml
+++ b/aws-java-sdk/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk</artifactId>
@@ -15,6 +15,18 @@
 
   <!-- The dependencies section in pom.xml is auto generated. No manual changes are allowed -->
   <dependencies>
+    <dependency>
+        <artifactId>aws-java-sdk-ioteventsdata</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
+    <dependency>
+        <artifactId>aws-java-sdk-iotevents</artifactId>
+        <groupId>com.amazonaws</groupId>
+        <optional>false</optional>
+        <version>${awsjavasdk.version}</version>
+    </dependency>
     <dependency>
         <artifactId>aws-java-sdk-iotthingsgraph</artifactId>
         <groupId>com.amazonaws</groupId>
diff --git a/jmespath-java/pom.xml b/jmespath-java/pom.xml
index ab7b9cf0f335..403695ad711d 100644
--- a/jmespath-java/pom.xml
+++ b/jmespath-java/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.563-SNAPSHOT</version>
+    <version>1.11.563</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>jmespath-java</artifactId>
diff --git a/pom.xml b/pom.xml
index 3639048024c9..ef6c76c4c146 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-pom</artifactId>
-  <version>1.11.563-SNAPSHOT</version>
+  <version>1.11.563</version>
   <packaging>pom</packaging>
   <name>AWS SDK for Java</name>
   <description>The Amazon Web Services SDK for Java provides Java APIs
@@ -33,6 +33,8 @@
   </developers>
   <!-- The module section in pom.xml is auto generated. No manual changes are allowed -->
   <modules>
+    <module>aws-java-sdk-ioteventsdata</module>
+    <module>aws-java-sdk-iotevents</module>
     <module>aws-java-sdk-iotthingsgraph</module>
     <module>aws-java-sdk-groundstation</module>
     <module>aws-java-sdk-mediapackagevod</module>
diff --git a/release.properties b/release.properties
index c5e6816a0d79..a24cffc4803f 100644
--- a/release.properties
+++ b/release.properties
@@ -1 +1 @@
-releaseId=a722916f-9032-4e4e-90a6-2427c3d79d49
\ No newline at end of file
+releaseId=5bb3afde-a0fc-4c13-ae4d-85da0ada760e
\ No newline at end of file